BlackMajor
|
5245898c25
|
whoops
|
2019-12-17 23:46:15 +13:00 |
|
BlackMajor
|
03d2e9eb6d
|
Compress secK9
|
2019-12-17 23:32:51 +13: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 |
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
kappa-sama
|
525d36cc6b
|
chaos
|
2019-12-03 23:18:45 -05:00 |
|
kappa-sama
|
af0cbc460b
|
charger
|
2019-12-03 23:18:03 -05:00 |
|
Ghommie
|
428234c0d6
|
Dilemma.
|
2019-12-03 06:53:46 +01:00 |
|
Ghommie
|
fa270c8a79
|
leftovers.
|
2019-12-03 06:48:25 +01:00 |
|
Ghommie
|
3c7d2972de
|
Porting some return type annotations and bad keyword fixes, linter stuff.
|
2019-12-03 03:31:35 +01:00 |
|
Lin
|
a33dba803e
|
Merge pull request #9992 from Ghommie/Ghommie-cit411
Fixes ai displays status being reset to "Neutral" on login, regardless of choice.
|
2019-12-03 01:36:02 +00:00 |
|
Ghommie
|
9b62a5ad01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:33:32 +01:00 |
|
Ghommie
|
8615c0ea8f
|
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:32:59 +01:00 |
|
Lin
|
00acb5749f
|
Merge pull request #9988 from Ghommie/Ghommie-cit409
Fixes ED-209 being unbuildable past the welding step.
|
2019-12-03 01:31:40 +00:00 |
|
Putnam3145
|
e1a9c8e6d3
|
Merge pull request #9972 from Ghommie/Ghommie-cit403
Fixed double whitespace gap in human, ai and carbon examine.
|
2019-11-30 22:46:29 -08:00 |
|
kevinz000
|
4183d00da2
|
Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
|
2019-11-28 23:08:32 -07:00 |
|
Sishen
|
69e11e4203
|
olllll
|
2019-11-28 23:01:15 -07:00 |
|
Sishen
|
3a1e4dec5a
|
Revert "lol"
This reverts commit 7f6a1a6fda.
|
2019-11-28 23:00:13 -07:00 |
|
Sishen
|
7f6a1a6fda
|
lol
|
2019-11-28 22:53:39 -07:00 |
|
Ghommie
|
2bd4ac5de8
|
Also AI and Carbon
|
2019-11-29 06:31:23 +01:00 |
|
Ghommie
|
e4d37db02c
|
thanks travis
|
2019-11-29 05:46:26 +01:00 |
|
Ghommie
|
e6484a22a8
|
Ports tgstation loom changes, and durathred golems.
|
2019-11-29 05:34:17 +01:00 |
|
Ghommie
|
65245dafed
|
Fixes ai displays status being reset to "Neutral" on login.
|
2019-11-29 04:07:56 +01:00 |
|