shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,524 Commits 5 Branches 0 Tags
bd1b79b182652a63e642995e09e151e4e068aec7
Commit Graph
2801 Commits
Author SHA1 Message Date
kevinz000andGitHub 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
kevinz000andGitHub 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
kappa-samaandGitHub 525d36cc6b chaos 2019-12-03 23:18:45 -05:00
kappa-samaandGitHub 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
LinandGitHub 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
LinandGitHub 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
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
kevinz000andGitHub 4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400 
Ports elements: Lightweight shared/global components.
 2019-11-28 23:08:32 -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 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 b66832809e Fixing that tiny gap in human examine. 2019-11-28 04:37:16 +01:00
Ghommie dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +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
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
YakumoChenandGitHub 1c8b557466 fixes AI.dm again 2019-11-23 04:13:30 +00:00
YakumoChenandGitHub 6426e5dade makes the icons not break 2019-11-23 03:54:39 +00:00
YakumoChenandGitHub a6ff44782a adds more unique ai holograms 2019-11-23 03:51:04 +00:00
FermiandFermi b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
GrayRachnid c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie 7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
kiwedesparsandGitHub 98998ca85f un-moths the anthromorphic insects 2019-11-21 19:47:48 -08:00