shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,904 Commits 5 Branches 0 Tags
c4f736eb9451aad478d28b9440bb3fd45f5135ba
Commit Graph
1060 Commits
Author SHA1 Message Date
deathride58andGitHub e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15 
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
 2019-07-08 18:15:20 -04:00
deathride58andGitHub 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
kevinz000andGitHub 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight 
Ports traitor codeword highlighting
 2019-07-05 06:57:49 -07:00
kevinz000andGitHub bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
kevinz000andGitHub 75f1dca544 Merge pull request #8773 from Sishen1542/podgang 
Podweak now have all customization options.
 2019-07-03 13:46:08 -07:00
deathride58 4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
kevinz000andGitHub 09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting 
Carp now deflects the bullets instead of making them dissapear.
 2019-06-29 20:08:47 -07:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000andGitHub c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
Sishen 1459ada045 adds customization options for podweak 2019-06-28 10:22:09 -04:00
ArturlangandGitHub 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
Ghommie d7028b0059 Fixes "Bubbles ate my Cohiba Robusto!" 2019-06-27 05:32:08 +02:00
kevinz000andGitHub 67312abf04 Update life.dm 2019-06-25 01:37:51 -07:00
kevinz000andGitHub b45a789b54 Update life.dm 2019-06-25 01:35:56 -07:00
kevinz000andGitHub 05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69 
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
 2019-06-23 06:56:17 -07:00
kevinz000andGitHub dcab96d9d5 Merge pull request #8721 from Ghommie/Ghommie-cit77 
Ports in "Liver removal/failure now also stops passive reagent effects"
 2019-06-23 06:53:30 -07:00
BlackMajorandGitHub d6a31efaa2 Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5 
fixes piggybacking being delayless
 2019-06-24 01:31:40 +12:00
kevinz000andGitHub 6f2fbd8577 Merge pull request #8677 from Trilbyspaceclone/patch-182 
buffs speedy step quirk by a half
 2019-06-23 06:20:58 -07:00
Sishen a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie 45109776e1 Ports in "Liver removal/failure now also stops passive reagent effects" 2019-06-22 17:05:08 +02:00
Thalpyandkevinz000 498c35b733 Fixes empathy antag check exploit. (#8690) 
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
 2019-06-21 19:33:34 -07:00
TrilbySpaseClone 771ac9724e ports Fel connet 
Shamelessly stealing content
 2019-06-21 04:39:10 -04:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
kevinz000andGitHub 634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
TrilbyspacecloneandGitHub 4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
Poojawaandkevinz000 bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
kevinz000andGitHub 4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs 
Adds Hoverchairs and the paraplegic trait.
 2019-06-17 11:13:43 -07:00
deathride58andGitHub d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48 
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
 2019-06-16 22:50:15 -04:00
kevinz000andGitHub 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 
Ports origami skills for paper wiz loot
 2019-06-16 19:40:01 -07:00
ThalpyandGitHub 98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
unknown b90d344afc It works. It just works. 2019-06-12 01:10:21 +03:00
Poojawa d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
kevinz000andGitHub b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
kevinz000andGitHub 1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
kevinz000 ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000andGitHub 1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000andGitHub 5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
ThalpyandGitHub 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
kevinz000andGitHub ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000andGitHub 9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss 
Rebalanced Ass Slapping
 2019-06-08 01:17:04 -07:00
TrilbyspacecloneandGitHub 79a456a0ac Update carbon_defense.dm 2019-06-07 18:29:42 -04:00
deathride58andGitHub aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
BurgerLua 8778349821 added 2019-06-05 11:43:28 -07:00
kevinz000andGitHub 2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries 
Fixes prosthetic invisible hands, improves female markings
 2019-06-05 02:02:40 -07:00
kevinz000andGitHub 980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
kevinz000andGitHub 89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24 
zero, , null, and empty text strings, all fulfill the ! operator.
 2019-06-05 01:52:17 -07:00