Commit Graph

11792 Commits

Author SHA1 Message Date
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie
2611023488 Ports "Roundstart borg brains no longer decay." 2019-12-13 07:33:45 +01:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
Ghommie
c098d497ad Minor underwear fixes and tweaks. 2019-12-13 06:50:14 +01:00
kappa-sama
93c4d3c1af martial artists 2019-12-12 23:27:12 -05:00
Trilbyspaceclone
285833c8d3 Runtime fix 2019-12-12 21:51:50 -05:00
Trilbyspaceclone
658e050b1f Ghommie correction 2019-12-12 21:47:54 -05:00
Trilbyspaceclone
e6282e95c2 Apply suggestions from code review
Ghommie fixes

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-12 21:46:31 -05:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
Ghommie
284202a092 two lines. 2019-12-13 02:37:51 +01:00
Ghommie
7d7bcc7c34 Fixes and ready up. 2019-12-13 02:30:21 +01:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
BlackMajor
725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
2019-12-13 10:20:33 +13:00
Putnam3145
71b2754aa6 Merge pull request #10121 from kappa-sama/patch-12
plasmafist wizard plasmafist wizard
2019-12-12 12:28:49 -08:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
2019-12-12 09:30:34 -08:00
Ghommie
bc2e6a7f9b Ports "Fixes powernet avail checks" 2019-12-12 17:35:35 +01:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Seris02
7b75612ad1 woops 2019-12-12 19:21:23 +08:00
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00
Linzolle
acffa683c9 clearer message? 2019-12-12 00:40:08 -06:00
Lin
a4d52454db Merge pull request #10085 from Ghommie/Ghommie-cit440
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
2019-12-12 02:13:54 +00:00
kappa-sama
b89d04884e indents oops 2019-12-11 17:23:00 -05:00
kappa-sama
2b8f81bca3 idk maybe 2019-12-11 17:22:14 -05:00
kappa-sama
be3439e461 idk maybe? 2019-12-11 16:57:06 -05:00
kevinz000
41a61cffa7 Update utility.dm 2019-12-11 14:46:05 -07:00
kevinz000
ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Trilbyspaceclone
d2a8c6c220 Feast or Fammin is shit,
more at 11
2019-12-10 14:51:01 -05:00
Seris02
dfc8a1dc73 fixes it
if it breaks I blame you again putnam
2019-12-11 03:08:52 +08:00
Seris02
31950c106f change cost to 18 tc 2019-12-10 12:07:33 +08:00
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
Putnam3145
ee65d93e5a Merge pull request #10086 from Ghommie/Ghommie-cit441
Fixes AI core display I may have broken with my coding extravaganza.
2019-12-09 13:41:25 -08:00
Putnam3145
5522b3d11d Merge pull request #10037 from Ghommie/Ghommie-cit421
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
2019-12-09 13:34:23 -08:00
Putnam3145
c54523e324 Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87
can we not tell all the nonantags that antagonist ooc is enabled please
2019-12-09 13:25:37 -08:00
Putnam3145
975a40cadf Merge pull request #10094 from Trilbyspaceclone/patch-242
Fixes eletroplating of brozne/golden tool box
2019-12-09 13:23:13 -08:00
Putnam3145
739f873ca6 Merge pull request #10132 from Trilbyspaceclone/patch-243
Makes meat hook fit in boh again
2019-12-09 13:08:12 -08:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
Trilbyspaceclone
7c4fab127f Update necropolis_chests.dm 2019-12-09 15:37:22 -05:00
Putnam3145
01bb9d79d9 Merge pull request #10114 from r4d6/n2o-pressure-tank
Add a N2O Pressure Tank
2019-12-09 12:33:03 -08:00
Artur
488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
Putnam
54162947bc Also takes into account external temp (radiation coming back in, specifically) 2019-12-09 07:10:01 -08:00
kappa-sama
f790d675d9 flavor text 2019-12-09 09:06:11 -05:00
Putnam
75d8be980a atmos tweaks 2019-12-09 02:00:58 -08:00
kevinz000
1866276d38 wrong intent 2019-12-08 22:13:15 -07:00