shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,190 Commits 5 Branches 0 Tags
bcc7949034f5546dcfc47735bbddee4eaba5b8b4
Commit Graph
30190 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 82eeec99bb Automatic changelog generation for PR #10976 [ci skip] 2020-02-10 05:09:21 -06:00
kevinz000andGitHub 88fa342c26 Merge pull request #10976 from Ghommie/Ghommie-cit565 
fixing another issue with the hear component signal.
 2020-02-10 04:09:19 -07:00
kevinz000 45bec21520 fix sync 2020-02-10 04:01:21 -07:00
Artur 816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Seris02 e6aa47997c fix rcd cost 2020-02-10 16:00:21 +08:00
CitadelStationBot 4e45525a26 Automatic changelog generation for PR #10926 [ci skip] 2020-02-10 01:40:13 -06:00
GhomandGitHub 0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
GhomandGitHub bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +01:00
Winter Flare e11c8c3647 Fixing a moneymaking oversight. 2020-02-10 00:35:31 -05:00
keronshb 023d49a207 30 removal 
Here it is
 2020-02-09 23:44:34 -05:00
Winter Flare bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
CitadelStationBot feadfae8f6 Automatic changelog generation for PR #10984 [ci skip] 2020-02-09 20:51:52 -06:00
GhomandGitHub 96a240bc11 Merge pull request #10984 from Trilbyspaceclone/patch-277 
Makes heads of staff no longer come to work as a gang leader
 2020-02-10 03:51:49 +01:00
Persi 4c2359de3b Separates gulag and public mining, removes sec vendor from gulag 2020-02-09 21:45:57 -05:00
DeltaFire 55a5686c01 No more Narsie runes in half the time or less 
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
 2020-02-10 02:46:54 +01:00
Hatterhat d24afcde1b pb burst from 60 to 81 2020-02-09 19:07:24 -06:00
keronshb 1492586f76 Fixes round 3? 4? 
Should fix the last round of requests?
 2020-02-09 18:18:55 -05:00
CitadelStationBot caf229b354 Automatic changelog generation for PR #10981 [ci skip] 2020-02-09 16:56:55 -06:00
GhomandGitHub 33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange 
Nerfing Stimulants
 2020-02-09 23:56:52 +01:00
keronshb 60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
GhomandGitHub 3a2eb8c1ad Update experimental_dissection.dm 2020-02-09 22:50:43 +01:00
CitadelStationBot 4bc5ea60b5 Automatic changelog generation for PR #10937 [ci skip] 2020-02-09 15:49:24 -06:00
GhomandGitHub c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00
CitadelStationBot 4e4346b8d4 Automatic changelog generation for PR #10277 [ci skip] 2020-02-09 14:47:34 -06:00
GhomandGitHub c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
CitadelStationBot 9ee5a84ad6 Automatic changelog generation for PR #10936 [ci skip] 2020-02-09 14:38:53 -06:00
GhomandGitHub 0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7 
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
 2020-02-09 21:38:50 +01:00
keronshb 9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
GhomandGitHub 101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9 
repulse sanity
 2020-02-09 21:09:00 +01:00
CitadelStationBot 09501340ec Automatic changelog generation for PR #10972 [ci skip] 2020-02-09 14:08:18 -06:00
GhomandGitHub d991fa1252 Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing 
Removes bone armor and dagger from crafting menu
 2020-02-09 21:08:16 +01:00
ArturlangandGitHub 29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
r4d6 e4f2af2d77 compile 2020-02-09 07:34:21 -05:00
r4d6 9ba0a1b470 Code update 2020-02-09 07:21:47 -05:00
GhomandGitHub bcbaea4a7b CallMaterialName reagent fix 2020-02-09 10:46:29 +01:00
YakumoChenandGitHub 1c24797de1 revert 10486 2020-02-09 06:41:13 +00:00
YakumoChenandGitHub a136273191 Merge pull request #20 from Citadel-Station-13/master 
k
 2020-02-09 01:37:37 -05:00
Ghommie c68c96373c Ok. 2020-02-09 07:07:47 +01:00
Ghommie f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
r4d6 e6398815b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf 2020-02-08 23:23:28 -05:00
CitadelStationBot a840b16c87 Automatic changelog generation for PR #10930 [ci skip] 2020-02-08 22:12:40 -06:00
kevinz000andGitHub 3264596bac Merge pull request #10930 from r4d6/meteor-alt-2 
Put the meteor timer to 3-5 minutes
 2020-02-08 21:12:38 -07:00
r4d6andGitHub 49f2993c59 Correct timer 2020-02-08 23:09:51 -05:00
r4d6 5316cc3665 Make dwarves not have an accent when speaking dwarvish 2020-02-08 23:02:32 -05:00
CitadelStationBot a3f1ef19c7 Automatic changelog generation for PR #10918 [ci skip] 2020-02-08 22:01:28 -06:00
kevinz000andGitHub 1f959012c5 Merge pull request #10918 from r4d6/dwarf-config 
Add dwarves as a round-start race
 2020-02-08 21:01:26 -07:00
r4d6 a8403cb072 Make Dwarves heal from Plump Helmet 2020-02-08 22:40:17 -05:00
GhomandGitHub 506f1199ad I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry 2020-02-09 02:56:17 +01:00
GhomandGitHub 2a0ba12896 Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11 
gun qdel fix
 2020-02-09 02:53:38 +01:00
GhomandGitHub ea9bdcd087 Update gangs.dm 2020-02-09 02:49:20 +01:00