Commit Graph

6932 Commits

Author SHA1 Message Date
coiax e93bb49994 Spinning resin or laying eggs on vents prompts the user if they're sure (#33302)
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.

This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
2017-12-17 19:27:45 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
deathride58 b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58 ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468
[MIRROR] Designs now default to department flag ALL instead of NONE
2017-12-15 04:21:56 +00:00
deathride58 fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
deathride58 5c4d9576db Merge pull request #4383 from Citadel-Station-13/upstream-merge-33216
[MIRROR] Player Z-tracking, again
2017-12-15 04:20:50 +00:00
deathride58 c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475
[MIRROR] Antag spawner fixes
2017-12-15 04:20:27 +00:00
deathride58 d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturska c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
deathride58 e5671eece5 Merge pull request #4379 from Citadel-Station-13/upstream-merge-33298
[MIRROR] Fixes zombie head removal
2017-12-14 22:20:45 +00:00
deathride58 f1ad5fe4d8 Merge pull request #4378 from Citadel-Station-13/upstream-merge-33207
[MIRROR] New closet sprites
2017-12-14 22:20:24 +00:00
oranges 382017cbe8 Merge pull request #33298 from QualityVan/zombrain
Fixes zombie head removal
2017-12-14 15:54:07 -06:00
nicbn 6f9ecf2f32 New closet sprites (#33207)
They're new sprites deal with it
2017-12-14 15:49:49 -06:00
Jordan Brown 253a3d519e Adds SDQL chat command (#33366)
Allow's calling SDQL from bots supporting the CHAT system API
2017-12-14 15:44:25 -06:00
Jordan Brown 7f997a6a6d Adds feedback for explosions (#33511)
* Adds feedback for explosions

* Remove stray quote

* Fixes + flash and flame
2017-12-14 14:00:51 -06:00
deathride58 7fafaa5500 Merge pull request #4371 from Citadel-Station-13/upstream-merge-33506
[MIRROR] Split personality now logs when a ghost gets control of it
2017-12-14 19:42:21 +00:00
deathride58 7b4e1b2e6b Update designs.dm 2017-12-14 14:38:10 -05:00
deathride58 37851fe771 Update antag_spawner.dm 2017-12-14 14:36:19 -05:00
deathride58 4d61ea105d Update holder2.dm 2017-12-14 14:33:17 -05:00
deathride58 78f36fb424 Merge pull request #4365 from Citadel-Station-13/upstream-merge-33490
[MIRROR] Fixes Cybernetic Lungs not being available in cyber_organs techweb node
2017-12-14 19:31:58 +00:00
ShizCalev 712b86089d Adds new gun dry firing sounds (#33503)
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
2017-12-14 06:15:11 -06:00
Leo d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
Epoc b2f24a3773 Adds Cybernetic Lungs to cyber_organs techweb node (#33490) 2017-12-13 22:09:56 -06:00
deathride58 7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
deathride58 fb492b5a14 Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494
[MIRROR] Fixes two unrelated runtimes
2017-12-14 03:54:08 +00:00
deathride58 a4fafb2b51 Merge pull request #4357 from Citadel-Station-13/upstream-merge-33493
[MIRROR] Fixes a couple Initialize procs
2017-12-14 03:53:50 +00:00
deathride58 8f2d72ebc2 Merge pull request #4361 from Citadel-Station-13/upstream-merge-33497
[MIRROR] Fixed several bad type checks in shuttle procs
2017-12-14 03:53:32 +00:00
deathride58 064de39fe4 Merge pull request #4362 from Citadel-Station-13/upstream-merge-33495
[MIRROR] Fixes do-sparks runtimes.
2017-12-14 03:53:16 +00:00
deathride58 da65aaab28 Merge pull request #4364 from Citadel-Station-13/upstream-merge-33456
[MIRROR] Adds a parent level subsystem initialized var
2017-12-14 03:53:02 +00:00
Emmett Gaines d517c797ab adds a parent level subsystem initialized var (#33456) 2017-12-13 21:11:51 -06:00
JStheguy 9313fd65cf Adds Additional Electronic_Assembly Designs (#33466)
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
2017-12-13 21:10:41 -06:00
AnturK db3afb8ee1 This is still pretty terrible (#33495) 2017-12-13 21:09:30 -06:00
Cruix 2afb3c0368 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 21:09:23 -06:00
Kyle Spier-Swenson 55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
deathride58 2e83779018 Update destructive_analyzer.dm 2017-12-13 16:49:05 -05:00
deathride58 b11d1c024e Merge pull request #4342 from Citadel-Station-13/upstream-merge-33496
[MIRROR] Fixes lobby stat entries not showing
2017-12-13 21:48:14 +00:00
deathride58 dbd08a18a4 Merge pull request #4349 from Citadel-Station-13/upstream-merge-33481
[MIRROR] Correctly set description of nonstandard cells
2017-12-13 21:47:57 +00:00
deathride58 a6220057be Update filingcabinet.dm 2017-12-13 16:47:29 -05:00
deathride58 da0ecad1ee Update order.dm 2017-12-13 16:47:00 -05:00
deathride58 bd2010eabb Update bins.dm 2017-12-13 16:46:18 -05:00
deathride58 08af4665b4 Update implant.dm 2017-12-13 16:45:54 -05:00
deathride58 81d30a08e6 Update cas.dm 2017-12-13 16:44:52 -05:00
deathride58 9f5cef7748 Update cas.dm 2017-12-13 16:44:34 -05:00
Leo 77aa84af1d Fixes a couple Initialize procs 2017-12-13 14:13:43 -06:00
Leo 27c06118cb Merge pull request #33478 from ACCount12/another_explosion_fix
Fixes yet another chem explosion throwing warnings
2017-12-13 14:13:36 -06:00
Leo 51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturska 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58 dc7dd2da3c Update dead.dm 2017-12-13 12:05:09 -05:00
deathride58 b03e606d35 Merge pull request #4347 from Citadel-Station-13/upstream-merge-33474
[MIRROR] Changes the goonchat failed to load message since updating byond isn't needed anymore
2017-12-13 17:04:10 +00:00