shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,374 Commits 5 Branches 0 Tags
1d9982d00a970da21ff64608ea99ef7a44020b5d
Commit Graph

30374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie
1d9982d00a Virology support for synthetic blood and some blood subtypes removal. 2020-02-16 10:36:16 +01:00
CitadelStationBot
d4072e3e1a Automatic changelog generation for PR #11011 [ci skip] 2020-02-16 00:48:25 -06:00
Hatterhat
40f7069480 tgstation 42495 - the one that makes more mechs take stock parts (#11011) 
* i think i got everything

* so how about that one comma
 2020-02-16 07:48:22 +01:00
CitadelStationBot
d6b7e19ee8 Automatic changelog generation for PR #11028 [ci skip] 2020-02-16 00:46:48 -06:00
Trilbyspaceclone
21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
CitadelStationBot
1ca3d75ebd Automatic changelog generation for PR #11105 [ci skip] 2020-02-16 00:39:59 -06:00
Trilbyspaceclone
a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
CitadelStationBot
128eeefcaf Automatic changelog generation for PR #10970 [ci skip] 2020-02-16 00:37:27 -06:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
CitadelStationBot
475fc0c913 Automatic changelog generation for PR #10949 [ci skip] 2020-02-16 00:36:53 -06:00
kevinz000
a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
CitadelStationBot
af33ad1090 Automatic changelog generation for PR #10857 [ci skip] 2020-02-16 00:31:33 -06:00
Seris02
c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) 
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
 2020-02-16 07:31:30 +01:00
kevinz000
828a339473 Merge pull request #11106 from Trilbyspaceclone/catfixesathing 
Test, fixing master
 2020-02-15 17:21:56 -07:00
TrilbySpaceClone
cba6667332 it could work 2020-02-15 18:42:50 -05:00
kevinz000
36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572 
Something about a couple runtimes.
 2020-02-15 12:19:50 -07:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568 
Something about cryopods.
 2020-02-15 12:17:02 -07:00
kevinz000
b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4 
/datum/element/cleaning cleans your face!
 2020-02-15 12:16:39 -07:00
CitadelStationBot
7a0f779a61 Automatic changelog generation for PR #10947 [ci skip] 2020-02-15 13:16:26 -06:00
kevinz000
f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 
Holopad static fix and a few other mistakes.
 2020-02-15 12:16:23 -07:00
CitadelStationBot
c7176b522f Automatic changelog generation for PR #10940 [ci skip] 2020-02-15 13:15:52 -06:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
CitadelStationBot
274fac7576 Automatic changelog generation for PR #10923 [ci skip] 2020-02-15 13:15:33 -06:00
kevinz000
56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7 
Nerfing cargo passive points generation
 2020-02-15 12:15:31 -07:00
kevinz000
eb33901046 Merge pull request #11002 from BlackMajor/walkerbois 
Makes the Ash Walker camp a static spawn in lavaland.
 2020-02-15 11:47:58 -07:00
kevinz000
957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 
Something about a couple stack trace issues.
 2020-02-15 11:47:30 -07:00
CitadelStationBot
b057a36fb7 Automatic changelog generation for PR #11071 [ci skip] 2020-02-15 12:46:59 -06:00
kevinz000
e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1 
Something about disposal bins and trash bags.
 2020-02-15 11:46:56 -07:00
kevinz000
b705e2fe37 Merge pull request #11069 from Ghommie/Ghommie-cit575 
Fixing some privates overlays
 2020-02-15 11:46:18 -07:00
CitadelStationBot
638daad243 Automatic changelog generation for PR #11072 [ci skip] 2020-02-15 12:46:03 -06:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
CitadelStationBot
69a0fa6ca7 Automatic changelog generation for PR #11073 [ci skip] 2020-02-15 12:45:53 -06:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -07:00
CitadelStationBot
24bb8b330f Automatic changelog generation for PR #11075 [ci skip] 2020-02-15 12:45:41 -06:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2 
Porting agent card updates and registered name fix.
 2020-02-15 11:45:39 -07:00
CitadelStationBot
8162aad3e6 Automatic changelog generation for PR #11047 [ci skip] 2020-02-15 12:44:54 -06:00
kevinz000
fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282 
Buffs oats and makes meatwheat have rarity
 2020-02-15 11:44:52 -07:00
CitadelStationBot
852dc40d3c Automatic changelog generation for PR #11040 [ci skip] 2020-02-15 12:44:27 -06:00
kevinz000
76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 
Further mob holder fixes.
 2020-02-15 11:44:25 -07:00
CitadelStationBot
a33669aacd Automatic changelog generation for PR #11094 [ci skip] 2020-02-15 12:12:22 -06:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Microvolnovka19
3f9965a781 Some sprite fixes (#11089) 
* Delete penis_onmob.dmi

* Some sprite fixes

* Delete penis_onmob.dmi

* This should be ok

* Delete penis_onmob.dmi

* This should be ok?

* Delete penis_onmob.dmi

* This totally should be ok
 2020-02-15 11:30:00 +01:00
CitadelStationBot
95398af552 Automatic changelog generation for PR #11048 [ci skip] 2020-02-15 02:05:47 -06:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 
Blood Drunk Miner now uses a PKA
 2020-02-15 09:05:45 +01:00
CitadelStationBot
b5015f696f Automatic changelog generation for PR #11086 [ci skip] 2020-02-15 02:04:56 -06:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2 
Ring Improvements
 2020-02-15 09:04:54 +01:00
Ghom
ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7 
!tgs valentine
 2020-02-15 09:04:29 +01:00
Ghom
acdc3cd2be Merge pull request #11095 from Citadel-Station-13/kevinz000-patch-4 
Fixes exosuit fabricators
 2020-02-15 09:00:21 +01:00
kevinz000
f6cf5adb4c Update mech_fabricator.dm 2020-02-14 15:33:47 -07:00