Commit Graph

6085 Commits

Author SHA1 Message Date
Ghommie f2cd85e550 Ports "You can now click on objects and mobs below flaps and signs" 2019-10-17 02:45:13 +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
kevinz000 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
kevinz000 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000 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
deathride58 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
Fermi 7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Ghommie e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
kevinz000 1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230
Update granters.dm
2019-10-13 13:58:03 -07:00
kevinz000 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
Zna12 18f10afcd7 Borgs are now consumable by scrub pups. 2019-10-13 15:23:50 -05:00
Thalpy 150b20103e Random tab 2019-10-13 16:39:37 +01:00
Thalpy 7b27d9bd24 Library time 2019-10-13 16:19:32 +01:00
Ghommie 7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
Thalpy 3abbfffdb8 Argh 2019-10-12 13:20:39 +01:00
Persi db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Linzolle b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
Fermi 7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000 b56563fcfe Merge pull request #9374 from kappa-sama/walktime
ashwalkers now have more messages telling them to not go on station
2019-10-11 12:13:49 -07:00
kevinz000 bcc92d234b Merge pull request #9386 from Sishen1542/suitrad
Gives suit storage units the ability to remove radiation from mobs
2019-10-11 12:13:04 -07:00
kevinz000 0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
kevinz000 9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1
[s] Adds a distance check to the supermatter tongs consume action, ported from TG
2019-10-11 12:10:53 -07:00
kevinz000 b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
kevinz000 9cd75c82a4 Merge pull request #9435 from Linzolle/firefix
fix fireman carry offhand not automatically deleting itself
2019-10-11 12:09:14 -07:00
kevinz000 98d03c73be Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something
Imagine Updating How Tables Work, But Forgetting MY TABLES
2019-10-11 12:05:53 -07:00
kevinz000 1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224
standarizes mobs' can_equip arguments.
2019-10-11 12:05:12 -07:00
Fermi dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
Trilbyspaceclone 7495de7d15 Update granters.dm 2019-10-11 14:04:08 -04:00