181417723e
Merge pull request #13816 from AnturK/bottopicfix
...
Fixes Bot topic checks
2015-12-20 20:45:49 -03:00
bab0d21e5a
Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
...
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
879bb6c0c0
A bit more sensible solution
2015-12-20 19:36:40 +01:00
a73f3261b3
Merge pull request #13771 from AnturK/pipecrawl
...
Ventcrawling fixes
2015-12-20 14:23:55 -03:00
46a11b0542
Ventcrawling fixes
2015-12-20 11:15:13 +01:00
bfced13c70
Doomsday Device
2015-12-20 02:23:42 -06:00
bde3995bc1
Merge pull request #13790 from tkdrg/niggers
...
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
0c1855ea18
Merge pull request #13777 from Xhuis/totally_not_for_an_upcoming_project
...
Merges all things related to side-/mini-antagonists into a single folder
2015-12-19 23:24:33 -03:00
c01e4d10a4
Merge pull request #13792 from Incoming5643/isnt_one_tail_bad_enough
...
Fixes weird lizard feature issues
2015-12-19 23:17:09 -03:00
c75a038676
Merge pull request #13796 from KorPhaeron/AI_follow
...
Clicking the (F) link on AI speech while make you orbit their camera eye
2015-12-19 23:15:46 -03:00
34733cf01c
fuck shit pornhub
2015-12-19 18:01:05 -08:00
6207d9e052
haha whoooopppppppsssss
2015-12-19 17:52:06 -08:00
0d65351d3f
fixes
2015-12-19 17:51:11 -08:00
5e45b7efd0
Fixes bot topic checks
2015-12-19 21:47:07 +01:00
1ab5e80458
Tesla map removal to fix merge
2015-12-19 12:32:50 -08:00
e873395ffa
Merge pull request #13659 from bgobandit/beepskyfunremoval
...
Beepsky will no longer hunt aliens.
2015-12-19 02:49:33 -03:00
b621fb10d5
Removes special handling for mutant features on cloning. It didn't work and is inconsistent with how the rest of cloning works (it takes a snapshot of how you looked at the moment of death, including things that might not strictly be "genetic" like dyed hair color).
2015-12-18 21:48:06 -05:00
53ddc11f77
AI following
2015-12-18 20:36:11 -06:00
40212b6312
Fixes double tailed lizards
...
Depriciates *stopwag. *wag is now a toggle
2015-12-18 20:27:15 -05:00
92240a9d95
Fixes invisible mask exploits
...
This code is awful and full of copy-paste and I can't be assed/can't
manage to figure out how to fix it properly so I just got the hammer and
made it always update everything whenever you toggle a helmet. Exploit's
dead at least.
Fixes #13486
2015-12-18 21:40:23 -03:00
7fc726c00a
Changes bloodcrawl define location
2015-12-18 17:51:10 -05:00
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
2601154d63
Slightly better replicate chance for illusions
2015-12-18 14:02:27 -06:00
2034c3f878
Merges all side-antagonists into a new folder
2015-12-18 15:02:15 -05:00
5b0777e2b4
Faction copy
2015-12-18 13:57:25 -06:00
5a53b5294d
Properly adds Pentagon orbits.
2015-12-18 16:17:49 +00:00
163c84344b
Orbit improvements:
...
* Orbit is now less reliant on Animate(), for most ghosts this means 36 calls to Animate, vs the previous INFINITE, for those of you with potato computers, this should ease the pain and crashing.
* Orbits can now be something different to circles!
* Ghosts Byond Members can now choose between orbits! (Circle, Triangle, Square, Hexagon)
2015-12-18 16:12:42 +00:00
b92224b95b
Merge pull request #13728 from KorPhaeron/burning_singulo
...
Lava proofing
2015-12-18 03:49:55 -03:00
57d29d11d4
Replaces malf with traitor AI
2015-12-18 00:05:30 -06:00
a2241e0f6f
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
...
Conflicts:
code/modules/client/preferences.dm
icons/mob/head.dmi
tgstation.dme
2015-12-17 20:12:32 -05:00
a973a2518b
Merge pull request #13585 from KorPhaeron/reactive_expansion
...
Reactive mechanics expansion and shooting grenades/flamethrowers out of peoples hands
2015-12-17 17:05:53 -06:00
c342c28e2f
Merge pull request #13703 from neersighted/nano_reduction
...
NanoUI Reduction
2015-12-17 15:07:45 -03:00
197b4d58ea
Merge pull request #13693 from MrStonedOne/patch-86
...
Properly fixes resin exploit
2015-12-17 15:01:22 -03:00
332cc5af71
Re-organize NanoUI procs
2015-12-17 10:18:00 -06:00
af6f8c04a6
Admin items
2015-12-17 01:57:08 -06:00
d564e1e2f3
Lava proofing
2015-12-17 01:48:11 -06:00
4f647f1693
Merge pull request #13684 from MMMiracles/idedplsnerf
...
Gives ranged syndicate mobs no-stamina variant bullets (i died please nerf)
2015-12-16 23:40:03 -06:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
b6366d82fa
Merge pull request #13318 from MMMiracles/snowiscold
...
New Away Mission: Snow Valley+snow atmos
2015-12-16 21:01:07 -03:00
08b746935e
Merge pull request #13678 from AnturK/minorfixes
...
Fixes statue shuttle/space walking
2015-12-16 19:57:31 -03:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
5b45e9ce8f
Removes Mindless mobs from Orbit list.
2015-12-16 12:13:19 +01:00
8eaaf73972
Merge pull request #13656 from KazeEspada/Lizardspeech
...
Lizards only triple single s instead of double ss or more.
2015-12-16 21:52:52 +11:00
d9be79a11d
Merge pull request #13655 from Anonus/reventweak
...
Tweaks revenant reveal times down slightly
2015-12-16 21:39:20 +11:00
d52b94cc86
Merge pull request #13610 from KorPhaeron/sentience_act
...
Xenobio sentience clean up/fixes
2015-12-16 04:31:16 -03:00
ae7b3d9d94
Merge pull request #13579 from The-Albinobigfoot/shadowcucks_get_cucked_a_bit_less
...
Wishgranter malus nerf.
2015-12-16 04:10:30 -03:00
c69aab191c
Properly fixes resin exploit
...
Fixes #13667
Closes #13669
2015-12-15 22:29:29 -08:00
a349a15469
Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
...
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
b548de38cd
gives syndicate ranged mobs non-stamina giving versions of bullets
2015-12-15 21:53:55 -05:00
392ca2a505
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
2015-12-15 16:54:22 -05:00
tkdrg
AnturK
KorPhaeron
Cheridan
AndrewJacksonThe2nd
Incoming
Xhuis
Remie Richards
bgobandit
Bjorn Neergaard
oranges
MMMiracles
Jordie
Kyle Spier-Swenson
Razharas