Commit Graph
5660 Commits
Author SHA1 Message Date
deathride58andGitHub 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
TrilbyspacecloneandGitHub b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -04:00
Poojawa 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
BlackMajorandGitHub b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88
buffs c4 on mobs
2019-10-22 11:04:30 +13:00
kevinz000andGitHub c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Ghommie 760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
kevinz000andGitHub 4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250
Fixes silicons being unable to use the teleporter and records consoles from a distance
2019-10-21 01:07:27 -07:00
kevinz000andGitHub 838575da50 Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
Ghommie ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) 2019-10-20 15:41:48 +02:00
Ghommie 12192de0cd also records consoles. 2019-10-20 10:14:50 +02:00
Ghommie bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. 2019-10-20 10:08:58 +02:00
Ghommie ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Ghommie 9cb1f2b9d9 Little stunbaton nerf (split off from #9500) 2019-10-18 18:37:15 +02:00
Ghommie 2ca246d2eb fine-o 2019-10-18 18:33:02 +02:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
kevinz000andGitHub a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
kevinz000andGitHub 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
kevinz000andGitHub 1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
kevinz000andGitHub 033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2019-10-17 13:05:15 -07:00
kevinz000andGitHub d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
2019-10-17 13:04:15 -07:00
kevinz000andGitHub 8be030a931 Merge pull request #9482 from Thalpy/Wiki
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
kevinz000andGitHub 65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238
Ports some in operator misuse bugfixes.
2019-10-17 12:59:44 -07:00
Poojawa 66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie f73516a17f made it into config. 2019-10-17 04:44:30 +02:00
Ghommie cffa3f8cea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-10-17 03:09:59 +02:00
Ghommie 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Ghommie 57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
kevinz000andGitHub 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
Poojawa 4ee608e0c7 Fixes blood transfusion, QOL to IV drippers 2019-10-16 09:15:04 -05:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000andGitHub ae19dd16d8 Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms
Borgs are now consumable by scrub pups.
2019-10-15 22:59:20 -07:00
Ghommie e8b777f162 typo fixes 2019-10-16 05:10:44 +02:00
Ghommie 80ba44e5a2 Smells like work in progress 2019-10-15 22:03:38 +02:00
Ghommie 32013f2aeb More whacky situations. 2019-10-15 21:59:27 +02:00
Ghommie 839f324c99 I need a code quality test. 2019-10-15 21:39:13 +02:00
Ghommie 7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Ghommie aa6860250b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-10-15 20:40:07 +02:00
Thalpy acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
deathride58andGitHub 26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234
SDGF ghost poll message made terse, other tweaks.
2019-10-15 06:27:58 -04:00
deathride58 50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
Ghommie 0cb433ba99 Ports some in operator misuse bugfixes. 2019-10-15 00:26:13 +02:00
deathride58 b3a81dce01 Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs 2019-10-14 18:18:32 -04:00
Ghommie 80b91a56a8 undefined var fix 2019-10-14 23:58:39 +02:00
Ghommie d67e339980 teleprods works on non-carbons too now and minor stunbaton tweak. 2019-10-14 22:10:03 +02:00
FermiandFermi 7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00