Commit Graph

3345 Commits

Author SHA1 Message Date
kevinz000
2b254653b6 typepath 2019-12-16 16:27:00 -07:00
kevinz000
4fa744e78d radio short 2019-12-16 15:42:37 -07:00
kevinz000
2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
kevinz000
aa14713fdd nerfs 2019-12-16 08:12:49 -07:00
kevinz000
b3ad352a96 stuff 2019-12-16 08:10:41 -07:00
kevinz000
f11ab5eb61 hm 2019-12-15 23:29:25 -07:00
kevinz000
80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
kevinz000
78e9b82eb6 trying too hard 2019-12-15 23:03:44 -07:00
kevinz000
57748fcdc8 changes 2019-12-15 22:28:41 -07:00
kevinz000
932bdfd325 kay 2019-12-15 21:57:22 -07:00
kevinz000
3b47949f82 haha fuck that's a lotta changes 2019-12-15 19:59:15 -07:00
kevinz000
5f27103641 god FUCK you icons 2019-12-15 17:30:30 -07:00
kevinz000
8c27c176ca move this.. 2019-12-15 09:12:58 -07:00
kevinz000
db767d8ddf bad idea 2019-12-15 00:37:34 -07:00
kevinz000
a4ffef5b1f Typos 2019-12-15 00:36:20 -07:00
kevinz000
297c909b76 resting stuff 2019-12-15 00:29:18 -07:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
Putnam3145
2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
2019-12-14 20:37:57 -08:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07: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
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13: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
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
2019-12-12 09:30:34 -08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01: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
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
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
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Lin
9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
2019-12-08 20:01:50 +00:00
Lin
24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie
0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Ghommie
2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled 2019-12-06 16:37:46 +01:00
kevinz000
968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000
6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
54be35a243 Merge pull request #9997 from Sishen1542/nuked
removes superspeed from nuka cola
2019-12-05 21:48:34 -07:00
Putnam3145
3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
2019-12-05 20:47:39 -08:00
kevinz000
5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000
bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
2019-12-05 21:29:39 -07:00
kevinz000
bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
2019-12-05 21:28:03 -07:00
Ghommie
d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. 2019-12-06 03:38:39 +01:00
Ghommie
5024e900f7 Ooow fuck. 2019-12-06 02:45:55 +01:00
Ghommie
f1ccccbf36 drake. 2019-12-06 02:14:15 +01:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00