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
8ad1c54d4e
Merge pull request #10221 from optimumtact/patch-5
...
Stop triggering myself when viewing fork code
2015-06-29 14:47:28 -05: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
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
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
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
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
cad9b44264
Removes redundancy
2015-06-28 14:34:48 +02:00
20576bb71f
Adds blob toxin to examine
2015-06-28 14:34:48 +02:00
98c2bd18db
Merge pull request #9620 from xxalpha/mineralcontainer
...
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
7dfcc292b7
add a variable to mmi to indicate if it's of the syndicate variety as
...
suggested
2015-06-28 12:44:25 +01:00
f534e3c0ec
Merge pull request #10200 from Jordie0608/whoevenusesthese
...
Fixes Cheridan being a dork
2015-06-28 02:27:33 -05:00
d8bc3acea2
Stop triggering myself when viewing fork code
2015-06-28 18:48:40 +12:00
518dc0e6b4
nvm it works
2015-06-28 03:06:56 +01:00
7aef172888
less retardation
2015-06-28 03:02:13 +01:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
1a5be75225
Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner
...
Admin help tweaks.
2015-06-28 02:55:53 +03:00
9a64d1db9e
Removes duplicate variable in adminhelp.
2015-06-27 16:49:39 -07:00
8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
119c4d7929
Merge pull request #10186 from Anonus/m(i/a)crobombs
...
M(i/a)crobomb Adjustments
2015-06-28 00:19:06 +03:00
d9da2290e8
Cleans up adminhelp keyword searcher and changelog for #10196 .
2015-06-27 13:03:47 -07:00
352500d341
Sprites bo staff, adds custom martial art
2015-06-27 15:32:54 -04:00
df758c69b5
- cleans up camera deactivate()
...
- Aliens slashing cameras works now, fixes #10043
2015-06-27 22:13:18 +03:00
Xhuis
Cheridan
phil235
Razharas
Swag McYolosteinen
AnturK
Ikarrus
Razharas
Jordie
Orange Borg
xxalpha
phil235
AnturK
barackobama
MrStonedOne
Perakp