 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 |
|
|
Artur
|
82d1497ddc
|
Fixes bad buds and toxin healing
|
2019-12-05 17:29:00 +02:00 |
|
|
kappa-sama
|
7d77159748
|
5->20
|
2019-12-04 21:04:47 -05:00 |
|
|
Ghommie
|
ccd966ed28
|
Update, fix.
|
2019-12-04 20:32:25 +01:00 |
|
|
Ghommie
|
9455597e31
|
special snowflake.
|
2019-12-04 20:23:44 +01:00 |
|
|
Ghommie
|
c25508f1c2
|
turns dog/cat petting into an element.
|
2019-12-04 20:18:03 +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 |
|
|
Artur
|
af4eaf7f0f
|
Fixeesss
|
2019-12-03 23:09:11 +02: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 |
|
|
Artur
|
90113838a7
|
Iconfix and co
Traits instead of procs for fakedeath
Quickfix
Whoops this too
Loadsa fixes
Nerfs stamina regen
Too slow
Hm
|
2019-12-02 19:48:02 +02:00 |
|
|
Linzolle
|
f4318c9dba
|
bleeding indicator for more than jsut heparin
|
2019-12-01 18:10:48 -06:00 |
|
|
Artur
|
f48d8016d5
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-01 13:51:57 +02: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 |
|
|
Artur
|
02048ce009
|
Bludsuckers
|
2019-11-29 21:28:14 +02:00 |
|
|
Unknown
|
233ca30cd6
|
Merge branch 'master' into xantholne-christmas01
|
2019-11-28 23:21:36 -07: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 |
|
|
Ghommie
|
340e86e0f4
|
This is what you get for using magic numbers, assholes!
|
2019-11-29 02:45:38 +01:00 |
|
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
|
Ghommie
|
b66832809e
|
Fixing that tiny gap in human examine.
|
2019-11-28 04:37:16 +01:00 |
|
|
Unknown
|
33854e8fd8
|
Adds a huge amount of Christmas clothes
|
2019-11-27 20:07:39 -07:00 |
|
|
Ghommie
|
dd9116ee70
|
Ports elements: Lightweight shared/global components.
|
2019-11-28 01:47:20 +01:00 |
|
|
lolman360
|
dc1c17226d
|
Merge branch 'master' into HeadCorgi
|
2019-11-28 08:45:19 +11:00 |
|
|
Ghommie
|
af0110db40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-11-27 21:16:20 +01:00 |
|
|
Ghommie
|
f9680130f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-11-27 18:48:20 +01:00 |
|
|
Ghommie
|
3f077df500
|
redundant.
|
2019-11-27 06:40:32 +01:00 |
|