shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,794 Commits 5 Branches 0 Tags
5ca6c6cd5b689dbaf5ba09fdcc5ba40c4e2ca8d6
Commit Graph

3498 Commits

Author SHA1 Message Date
kappa-sama b015d2571a ==? 2019-12-08 03:51:36 -05:00
kappa-sama 10c844e70d does this even work 2019-12-08 03:36:09 -05: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
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Ghommie a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
TrilbySpaceClone 025a7cd79a more ports 
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
 2019-12-07 03:04:02 -05:00
TrilbySpaceClone c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05: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
Unknown 97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07: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
lolman360 08e1ab7b21 f 2019-12-06 16:11:41 +11:00
lolman360 dec79a9ba3 gg 2019-12-06 15:55:52 +11: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
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
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