6ef09bdbd8
Adds text for all antagonists
2015-06-30 01:15:28 -04:00
cb2043af82
Removes line of unused code
2015-06-29 23:47:18 -04:00
2cd02c5431
Antagonist popups
2015-06-29 23:44:21 -04:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
fc35897d23
Merge pull request #10267 from phil235/GhostSpriteFix
...
Fixes some ghost sprites
2015-06-29 15:36:27 -05:00
8ad1c54d4e
Merge pull request #10221 from optimumtact/patch-5
...
Stop triggering myself when viewing fork code
2015-06-29 14:47:28 -05:00
3cb792b1b8
Fixes some ghost sprites
2015-06-29 19:48:59 +02:00
7ce138afef
Merge pull request #9314 from AnturK/blob_examine
...
Adds blob toxin to blob description
2015-06-29 19:28:10 +02:00
5b5c03dd6b
Merge pull request #10234 from Ikarrus/spraycanerror
...
Gang Tweaks + Fixes
2015-06-29 20:24:16 +03:00
47b1deb528
Merge pull request #10204 from Razharas/VarEdit
...
Some varedit improvements
2015-06-29 19:18:28 +02:00
0bfe2a191b
removes leftovers
2015-06-29 19:02:51 +02:00
34434d6012
Merge pull request #10210 from Perakp/cameraFix
...
Fixes aliens slashing cameras
2015-06-29 18:53:59 +02:00
588c12ee22
Merge pull request #10219 from xxalpha/mouthgag
...
Fixed not being able to eat with adjusted masks.
2015-06-29 18:23:56 +02:00
a8bc78e16e
Merge pull request #10125 from Iamgoofball/patch-85
...
Buffs the traitor toxins
2015-06-29 17:36:11 +02:00
a39effd14c
Merge pull request #10193 from Cheridan/what_a_fluke
...
Suit Sensor Fixes
2015-06-29 17:32:44 +02:00
9b09a5115b
Increased recruitment cooldown to 3 minutes with bonus reductions at 30 seconds per head.
2015-06-29 08:46:11 -06:00
eb4d6c66a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit
2015-06-29 13:42:23 +03:00
afd2c0dcc6
Merge pull request #10250 from Jordie0608/orangesisadork
...
Orangesisadork
2015-06-29 15:49:51 +10:00
1da334b35d
orangesisasuperdork
2015-06-29 15:49:21 +10:00
3564376bab
whoops
2015-06-29 15:48:56 +10:00
cc51c43f1f
Merge pull request #10249 from Jordie0608/orangesisadork
...
changelog
2015-06-29 15:41:54 +10:00
6ace1a1cd0
changelog
2015-06-29 15:39:44 +10:00
f0d4dda9e1
Merge pull request #10218 from optimumtact/patch-3
...
Jetpack speed changes
2015-06-29 15:01:53 +10:00
0ef4c29a89
Recruitment proc checks for the implant first before gang affiliation.
2015-06-28 22:01:01 -06:00
77a77dd107
Jetpack speed changes [DNM]
...
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)
The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
a5c4d4134d
New Gene tag by Joan +fixes
2015-06-28 20:11:29 -06:00
46ce3fe0d9
Merge pull request #10214 from nukeop/fridge
...
Move the chemistry fridge between the front desks
2015-06-28 18:29:32 -05:00
5fc029d63d
Merge pull request #10215 from Ikarrus/freetheclothes
...
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
2015-06-28 18:16:04 -05:00
0ab6b99658
Flag cleaning.
2015-06-29 00:08:49 +01:00
6c0a930cfb
Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
...
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
47f3d802f6
Fixed not being able to eat with adjusted masks and helmets.
2015-06-28 23:51:55 +01:00
5a7d43aedd
Error message for trying use the spray can with the cap on
2015-06-28 11:18:29 -06:00
18c5ead218
Merge pull request #10233 from Xhuis/changelog
...
Changelog for gang fighting styles
2015-06-28 18:25:11 +02:00
ba6cf03cc6
Changelog for gang fighting styles
2015-06-28 12:21:36 -04:00
b6028d065f
Automatic changelog compile
2015-06-28 12:08:11 -04:00
d1b387bb32
Merge pull request #10230 from Ikarrus/fuckbombimplants
...
Macro/Micro bombs are now restricted to the Nuclear game mode.
2015-06-28 18:07:30 +02:00
8296c4642a
Changelog
2015-06-28 10:01:09 -06:00
cbee684951
Macro/Micro bombs are now restricted to the Nuclear game mode.
...
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
615c0be697
Automatic changelog compile
2015-06-28 10:40:19 -04:00
f3af74e44e
Merge pull request #10201 from Ikarrus/gangnerf
...
Gang Tweaks
2015-06-28 16:37:48 +02:00
fbafd72660
Pistol Ammo was lost in the conflict resolution
2015-06-28 08:32:33 -06:00
c08cfb8018
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
...
Conflicts:
code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
acca364c50
Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
...
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
601e7a6e09
Merge pull request #10095 from MrPerson/you_dare_bring_light_into_my_lair_you_must_die
...
Lighting SS speedup
2015-06-28 17:01:45 +03:00
080156bba1
Merge pull request #10085 from phil235/AcidFix
...
Acids, Smoke, Foam, reagents reaction() refactors
2015-06-28 16:57:20 +03:00
c1a37bb2e0
Derp, I hate fixing merge conflicts...
2015-06-28 15:27:58 +02:00
ef9712be12
Polling instead of persistent.
2015-06-28 15:23:43 +02:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
6c488b289a
Merge pull request #9885 from kingofkosmos/latheexofabspittingstuff
...
Autolathe produces items on top of itself
2015-06-28 16:16:31 +03:00
c5b025e24e
Merge pull request #9784 from CorruptComputer/MapMergeUpdateThing
...
[Merge Ready] Updates Map Merge
2015-06-28 15:45:37 +03:00
Xhuis
Cheridan
phil235
phil235
Razharas
Swag McYolosteinen
AnturK
Ikarrus
Razharas
Jordie
Orange Borg
xxalpha
sybil-tgstation13
AnturK