shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,225 Commits 5 Branches 0 Tags
03e873478cb773e4668c6eb92312f7ba296b1afc
Commit Graph
33225 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie 03e873478c Fixing CE jump suit/skirt and accessory overlays. 2020-04-20 23:11:58 +02:00
GhomandGitHub c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5 
Shuffles resist embed higher up on the resist chain
 2020-04-20 22:34:03 +02:00
kevinz000andGitHub a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000andGitHub 096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000andGitHub 791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message 
Snitches now get stitches
 2020-04-20 11:43:37 -07:00
kevinz000andGitHub 62418d3fb8 Merge pull request #11909 from Putnam3145/owai-broom-mop 
Adds more service stuff to lathes.
 2020-04-20 11:43:30 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 893f57cb63 Merge pull request #11919 from Ghommie/Ghommie-cit690 
Nerfing the bonus reagents from higher tier microwaves.
 2020-04-20 11:34:53 -07:00
kevinz000andGitHub 33cfb9a566 Merge pull request #11920 from Ghommie/Ghommie-cit691 
Removing troublesome and filler uplink items.
 2020-04-20 11:34:44 -07:00
kevinz000andGitHub cbc9f325f4 Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod 
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
 2020-04-20 11:34:06 -07:00
kevinz000andGitHub 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
GhomandGitHub af620582b1 Merge pull request #11924 from Trilbyspaceclone/patch-346 
Moves barkeeps cryo fluid to emag only in the Soda Dispender
 2020-04-20 19:35:31 +02:00
necromanceranne 9919a23966 This fixes everyone being a pugilist holy fuck 2020-04-21 00:36:54 +10:00
GhomandGitHub 10ae9bb51d Merge pull request #11944 from Trilbyspaceclone/patch-349 
Corrects shield implants being invisable
 2020-04-20 13:39:07 +02:00
GhomandGitHub bb5c4d9dd4 Merge pull request #11948 from kevinz000/woops 
potentially fixes biotypes breaking in viruses
 2020-04-20 13:38:36 +02:00
kevinz000 dc97b65681 Revert "Revert "Update mobs.dm"" 
This reverts commit d8d6ae8555.
 2020-04-20 04:03:13 -07:00
kevinz000 d8d6ae8555 Revert "Update mobs.dm" 
This reverts commit 1b9bfe9674.
 2020-04-20 04:01:57 -07:00
kevinz000andGitHub 1b9bfe9674 Update mobs.dm 2020-04-20 04:00:47 -07:00
TrilbyspacecloneandGitHub 6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
GhomandGitHub d2cfb7608a Merge pull request #11926 from MrJWhit/adds-another-power-line-in-box 
Fixing up of boxstation
 2020-04-20 02:35:23 +02:00
GhomandGitHub 2cf8dad8ae Merge pull request #11928 from Putnam3145/traitor-class-reroll 
Made traitor classes rerollable, reassignable by admins
 2020-04-20 02:30:33 +02:00
GhomandGitHub 850c08cb0e Merge pull request #11894 from NopemanMcHalt/trek_tmp 
Adds not-so-great TMP-era trek utility uniform, also fixes loadout restriction descs
 2020-04-20 02:21:24 +02:00
kevinz000andGitHub ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
CitadelStationBotandGitHub 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
LinandGitHub 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
LinandGitHub 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
GhomandGitHub 8551998833 Update critter.dm 2020-04-19 14:07:13 +02:00
kevinz000andGitHub 792af56b67 Update riding.dm 2020-04-19 00:48:51 -07:00
Anonymous 043950a3ee Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/obj/clothing/uniforms.dmi
 2020-04-19 09:51:21 +03:00
GhomandGitHub f714403d6e Merge pull request #11895 from Seris02/piggybackfix 
fixes piggyback merging
 2020-04-19 04:56:04 +02:00
GhomandGitHub ddf0480ec9 Merge pull request #11933 from Trilbyspaceclone/patch-348 
Ports TG#50091 - Fixes rolling paper by nemvar
 2020-04-19 04:54:09 +02:00
TrilbyspacecloneandGitHub 2039fb80e6 Update fancy.dm 2020-04-18 22:37:05 -04:00
kevinz000andGitHub 24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693 
More ToS Compliance.
 2020-04-18 19:33:10 -07:00
kevinz000andGitHub 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
kevinz000andGitHub b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2 
Revert "Makes so turning in place updates riders when riding someone's back"
 2020-04-18 19:32:34 -07:00
kevinz000andGitHub 5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields! 
Adds more shields and tweaks a few!
 2020-04-18 19:32:09 -07:00
GhomandGitHub b08ad2dd2b Merge pull request #11907 from Linzolle/ripicon 
fix ripley construction icon
 2020-04-19 03:40:27 +02:00
GhomandGitHub e8b5ebecc3 Merge pull request #11911 from kevinz000/compression 
Compresses synthesized instruments and .. vore.
 2020-04-19 03:26:19 +02: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
GhomandGitHub 6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red 
Makes zipties white again
 2020-04-19 02:45:31 +02:00
Ghommie 39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
LinandGitHub 8d8a0b0f45 Merge pull request #11899 from Ghommie/Ghommie-cit686 
Fixing some more mistakes I did to clothing.
 2020-04-19 00:24:29 +00:00
Changelogs 877c912dc1 Automatic changelog compile [ci skip] 2020-04-19 00:04:27 +00:00
GhomandGitHub 998b199dba Merge pull request #11927 from kappa-sama/patch-22 
ports tg's fix to instant surgery closing
 2020-04-19 01:21:23 +02:00
GhomandGitHub 7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again 
Fixes a divide-by-zero
 2020-04-19 00:32:41 +02:00
Putnam 9976fab42b Made traitor classes rerollable, reassignable by admins 2020-04-18 14:40:41 -07:00
kappa-samaandGitHub 2654352d0c tg surgery fixes time 2020-04-18 17:37:19 -04:00
MrJWhit ba9d7c7dbc Fixing up of boxstation 2020-04-18 17:12:16 -04:00
TrilbyspacecloneandGitHub a5b7f506f9 Update chem_dispenser.dm 2020-04-18 16:42:46 -04:00
necromanceranne 97bd52f03e haha me too 2020-04-19 04:49:11 +10:00