Commit Graph

6932 Commits

Author SHA1 Message Date
deathride58
e46811d210 Update cell.dm 2017-12-13 12:03:21 -05:00
deathride58
1a1e03490a Update gygax.dm 2017-12-13 12:02:50 -05:00
deathride58
2c6fb87de0 Merge pull request #4350 from Citadel-Station-13/upstream-merge-33487
[MIRROR] Fixes genetics mutations disappearing
2017-12-13 17:02:03 +00:00
Jordan Brown
057d05df91 Merge pull request #33484 from vuonojenmustaturska/eminencefix
Fixes glass shard/bananium floor behavior for cameras and ghosts
2017-12-13 09:14:16 -06:00
Jordan Brown
5709d44968 Merge pull request #33487 from deathride58/fixesgenetics
Fixes genetics mutations disappearing
2017-12-13 09:14:09 -06:00
Jordan Brown
129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
LetterJay
9d3103479a Merge pull request #4344 from deathride58/donorspritefix
Fixes donator items not rendering properly when worn
2017-12-13 04:46:28 -06:00
Kyle Spier-Swenson
73de2b7fe9 Changes the goonchat failed to load message since updating byond isn't needed anymore (#33474)
It was a 511 beta that caused this issue, anybody still on 511 beta is not supported, They can move up to stable
2017-12-12 22:51:21 -06:00
oranges
a17af0530d Merge pull request #33475 from AnturK/ineedtocleanuptheselater
Antag spawner fixes
2017-12-12 20:02:55 -06:00
deathride58
046138b896 Merge pull request #4335 from Citadel-Station-13/upstream-merge-33458
[MIRROR] Adds a chat command to reload admins in case someone locks themselves out.
2017-12-13 01:24:36 +00:00
deathride58
c339a603db Merge pull request #4341 from Citadel-Station-13/upstream-merge-33467
[MIRROR] Adds extra labcoats to medical wardrobe
2017-12-13 01:24:20 +00:00
deathride58
6ad5b5030e Merge pull request #4343 from Citadel-Station-13/upstream-merge-33451
[MIRROR] Fixes the free worker bee getting stuck in the hive and never leaving
2017-12-13 01:24:01 +00:00
deathride58
61131f43d9 Merge pull request #4339 from Citadel-Station-13/upstream-merge-33206
[MIRROR] Both cult revive runes will now replace braindead/AFK cultists
2017-12-13 01:23:13 +00:00
deathride58
6fc0cdc67e Merge pull request #4336 from Citadel-Station-13/upstream-merge-33457
[MIRROR] Check ticks some more in dock()
2017-12-13 01:22:52 +00:00
deathride58
bf61f55b25 Fixes donator items not rendering properly when worn 2017-12-12 20:16:51 -05:00
oranges
181afe9640 Fixes the free worker bee getting stuck in the hive and never leaving (#33451)
ten outta ten code
2017-12-12 15:57:49 -06:00
Jordan Brown
1bb487ebae Fixes lobby stat entries not showing 2017-12-12 15:56:38 -06:00
Mark9013100
a68b5bd3cb Adds extra labcoats to medical wardrobe (#33467) 2017-12-12 14:27:22 -06:00
deathride58
5535509a65 fixes broken metabolism 2017-12-12 15:15:22 -05:00
Robustin
685bf8b48c Both cult revive runes will now replace braindead/AFK cultists (#33206)
* "Revive" AFKs

* "Revives" inactive clock cultists

* AFK boot notice

* Missing parenthesis

* Revive targets correct mob

* Poll fix

* Fixes inactive revive mob

* Suicide Counter
2017-12-12 13:48:18 -06:00
Jordan Brown
c599e2fbc8 Designs now default to department flag ALL instead of NONE 2017-12-12 13:10:15 -06:00
Jordan Brown
367872f962 Merge pull request #33457 from ninjanomnom/check-your-tick
Check ticks some more in dock()
2017-12-12 13:05:49 -06:00
kevinz000
cc598d873c Adds a chat command to reload admins in case someone locks themselves out. (#33458)
* Update chat_commands.dm

* skype
2017-12-12 13:04:39 -06:00
deathride58
880002ada0 Merge pull request #4332 from Citadel-Station-13/upstream-merge-33446
[MIRROR] INVOKE_ASYNC is the exception not the rule!
2017-12-12 03:23:36 +00:00
deathride58
151ba66ed4 Merge pull request #4331 from Citadel-Station-13/upstream-merge-33425
[MIRROR] Makes swarmers check for mobs in objects
2017-12-12 03:23:20 +00:00
Leo
2221d854a1 Merge pull request #33446 from tgstation/Cyberboss-patch-3
INVOKE_ASYNC is the exception not the rule!
2017-12-11 20:39:38 -06:00
swindly
1a15772c3a Makes swarmers check for mobs in objects (#33425) 2017-12-11 20:38:28 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
b5600cb91c Merge pull request #4328 from Citadel-Station-13/upstream-merge-33462
[MIRROR] Ordered turfs quickfix
2017-12-11 19:08:09 +00:00
deathride58
ba9fc0ccc5 Merge pull request #4327 from Citadel-Station-13/upstream-merge-33440
[MIRROR] Fixes projectile runtime due to click params but no target location (this happens when click catcher catches shoot clicks instead of normal firing.)
2017-12-11 18:20:38 +00:00
Leo
9a0961c320 Merge pull request #33462 from ninjanomnom/dont-be-so-negative
Ordered turfs quickfix
2017-12-11 12:15:29 -06:00
kevinz000
d22aee94a1 Fixes nulls (#33440) 2017-12-11 11:31:27 -06:00
FrozenGuy5
89e8ccba5b Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 11:30:16 -06:00
Jordan Brown
04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves
Changes captain glove description
2017-12-11 08:59:36 -06:00
deathride58
0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCount
a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
deathride58
051b45c680 Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316
[MIRROR] Adds games vendor resupply crate
2017-12-11 00:46:00 +00:00
deathride58
fdefdef3e7 Merge pull request #4319 from Citadel-Station-13/upstream-merge-33428
[MIRROR] Small Rebalance to hardsuit's armor ratings
2017-12-11 00:20:56 +00:00
deathride58
71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424
[MIRROR] Standardization of return_ordered_turfs
2017-12-11 00:06:54 +00:00
deathride58
c211552c9d Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309
[MIRROR] Silver slime extract foods now fry correctly
2017-12-11 00:03:05 +00:00
deathride58
ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 23:50:20 +00:00
deathride58
cdc23ad79e Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265
[MIRROR]  Good Clean Fun: A vending machine for games!
2017-12-10 23:50:05 +00:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
[MIRROR] Airlock Construction Update
2017-12-10 23:49:51 +00:00
deathride58
c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361
[MIRROR] Removes juicers
2017-12-10 23:49:41 +00:00
deathride58
6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276
[MIRROR] Restores the uplink modules, removes LoadComponents
2017-12-10 23:49:25 +00:00
FrozenGuy5
9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
coiax
6846e87ae2 Silver slime extract foods now fry correctly (#33309)
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
2017-12-10 17:42:20 -06:00