shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,006 Commits 5 Branches 0 Tags
73a0976d4eeebca445c2e4b2bf6fef3021c98d80
Commit Graph
3391 Commits
Author SHA1 Message Date
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
Putnam3145andGitHub 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
kevinz000andGitHub 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
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
Ghommie d1d201ff26 Sanity check. 2019-11-27 06:39:09 +01:00
Ghommie d43d996c38 ouch 2019-11-27 06:19:17 +01:00
Ghommie c67f138d23 patching some combat mode edge cases and issues. 2019-11-27 06:10:08 +01:00
Ghommie d3bce1bbcd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2019-11-27 02:59:08 +01:00
Ghommie 4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
kevinz000andGitHub ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi 
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
 2019-11-26 16:02:42 -07:00
kevinz000andGitHub 6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks 
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
 2019-11-26 16:01:48 -07:00
kevinz000andGitHub 8b56e25d97 Merge pull request #9920 from YakumoChen/ai-sprites 
Ports a bunch of VG's AI sprites
 2019-11-26 15:59:09 -07:00
YakumoChenandGitHub 0b9ea6c7f0 no pedoing the AI 2019-11-26 19:58:25 +00:00
BlackMajorandGitHub 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
BlackMajorandGitHub c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajorandGitHub 47b5dbeaaa Merge pull request #9625 from Ghommie/Ghommie-cit277 
Unmodularize digi/muzzled clothing sprites.
 2019-11-25 11:30:31 +13:00
Fermi 99e9c606c0 I dunno what I did but it's fixed... somehow. 2019-11-24 04:03:51 +00:00
Fermi 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 1509d9d183.
 2019-11-24 03:33:02 +00:00
FermiandFermi ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
FermiandFermi aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
FermiandFermi 1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
 2019-11-24 03:04:13 +00:00
FermiandFermi c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
FermiandFermi 4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
FermiandFermi 9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
FermiandFermi 8ea6618f5d Revert "ARGH" 
This reverts commit f0f52ce3f8.
 2019-11-24 03:01:59 +00:00
FermiandFermi f0f52ce3f8 ARGH 2019-11-24 02:55:50 +00:00
FermiandFermi 0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
FermiandFermi b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
FermiandFermi 8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
FermiandFermi 135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
FermiandFermi 00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
FermiandFermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
kevinz000andGitHub f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379 
Honkbot slip and slide fun ride.
 2019-11-23 11:49:32 -07:00