shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,266 Commits 5 Branches 0 Tags
fecf6cef2f0fc924a3cb42f2a7b49e8eeab4fffb
Commit Graph

7693 Commits

Author SHA1 Message Date
Ghommie fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghom 50eae569eb Merge pull request #11940 from Detective-Google/null-roddies 
Turns chaplain null rod selection into a radial function(port TG#50512)
 2020-04-20 23:53:24 +02:00
kevinz000 791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message 
Snitches now get stitches
 2020-04-20 11:43:37 -07:00
kevinz000 85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu 
Cleans up misc tab in the crafting menu
 2020-04-20 11:37:13 -07:00
kevinz000 ff651ac881 Merge pull request #11931 from Ghommie/Ghommie-cit694 
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
 2020-04-20 11:31:31 -07:00
Trilbyspaceclone 6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
kevinz000 ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
Detective Google 0c2f0a99d5 fixes the fact that some citadel null rods aren't null rod subtypes 2020-04-19 17:18:40 -05:00
Detective Google 5376ca81b5 Turns chaplain null rod selection into a radial function(port TG#50512) 2020-04-19 16:57:02 -05:00
CitadelStationBot 22dd41925f Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3 
Fixing critter crates having an invalid icon state when opened.
 2020-04-19 15:11:28 -05:00
Lin 88b5ca72b7 Merge pull request #11906 from Citadel-Station-13/Ghommie-patch-2 
Fixing Forensic scanners not reading blood DNA.
 2020-04-19 16:53:54 +00:00
Lin d75e3f79bd Merge pull request #11917 from Ghommie/Ghommie-cit688 
Makes warm donk pockets cooling after 7 minutes canon again.
 2020-04-19 16:52:33 +00:00
Ghom 8551998833 Update critter.dm 2020-04-19 14:07:13 +02:00
Trilbyspaceclone 2039fb80e6 Update fancy.dm 2020-04-18 22:37:05 -04:00
kevinz000 ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687 
fix for my relatively minuscule backend refactor for holodeck.
 2020-04-18 19:32:50 -07:00
kevinz000 5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields! 
Adds more shields and tweaks a few!
 2020-04-18 19:32:09 -07:00
Ghommie d5a43be181 Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. 2020-04-19 03:07:45 +02:00
Ghom 6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red 
Makes zipties white again
 2020-04-19 02:45:31 +02:00
TrilbySpaceClone 8ca7bb7535 Right... 2020-04-18 09:46:56 -04:00
Ghommie 8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. 2020-04-18 15:40:18 +02:00
Trilbyspaceclone d26ba86660 Update shields.dm 2020-04-17 23:30:58 -04:00
Putnam 33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization 2020-04-17 18:56:26 -07:00
Ghommie 96b64009d0 Oh, nullspace. 2020-04-18 03:44:49 +02:00
Ghom 3188ef3475 Whops 2020-04-18 03:32:54 +02:00
Ghom cf505f900a Update atoms.dm 2020-04-18 03:29:45 +02:00
Ghommie ac662a46c1 Extra support for bussed/lateloaded holodeck maps. 2020-04-18 03:15:05 +02:00
Ghommie 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
Trilbyspaceclone 7756a80beb Merge branch 'master' into shields! 2020-04-17 19:32:39 -04:00
Ghom 86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives 
Makes objectives clean theirselves up properly
 2020-04-18 01:20:02 +02:00
Lin 7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing 
Shield bashing
 2020-04-17 20:45:40 +00:00
Ghommie 87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
Trilbyspaceclone 0f7bc55755 le sigh 2020-04-17 10:25:48 -04:00
Trilbyspaceclone 8d4782290c Update shields.dm 2020-04-17 10:25:20 -04:00
kevinz000 7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff 
More mapping Loot tables and code improvements + Maints/Locker loot changes
 2020-04-17 05:51:26 -07:00
kevinz000 09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07:00
kevinz000 3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties 
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
 2020-04-17 05:43:49 -07:00
kevinz000 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07:00
DeltaFire dcd112c379 Hm yes maybe no ratting out would be nice 
What it says on the tin.
 2020-04-17 13:34:34 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
jjpark-kb 4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
Ghommie 2200c690f7 configs 2020-04-16 18:44:05 +02:00
Putnam 87dd2681ca The locate isn't necessary 2020-04-16 08:30:55 -07:00
Putnam 368d801940 Makes objectives clean theirselves up properly. 2020-04-16 08:17:48 -07:00
Ghommie fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
Artur 75dab9fa57 And some other fixes 2020-04-16 10:51:17 +03:00
Artur b023a0976b Makes zipties red again 2020-04-16 10:10:39 +03:00
kevinz000 e533103ed2 Merge branch 'master' into shield_bashing 2020-04-15 19:34:08 -07:00