shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,597 Commits 5 Branches 0 Tags
d3306e2eeccdf9fbc06df57731ff4caf198c2ea0
Commit Graph

444 Commits

Author SHA1 Message Date
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
Seris02
c4e9472b85 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading 2020-02-24 17:48:58 +08:00
Seris02
cbdb12e110 yes 2020-02-24 17:47:29 +08:00
Hatterhat
ba81184fef Merge branch 'master' into quickpatch-enzyme 2020-02-22 18:06:17 -06:00
Trilbyspaceclone
2cd8adf4da Update medical_designs.dm 2020-02-22 19:06:11 -05:00
Trilbyspaceclone
cf8b41723d Update medical_designs.dm 2020-02-22 18:35:40 -05:00
TrilbySpaceClone
c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
Trilbyspaceclone
511692a7cb Update medical_designs.dm 2020-02-22 18:30:32 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghom
26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
Ghom
d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
Hatterhat
b5e369aaf1 i forgot about that one 2020-02-19 21:00:31 -06:00
Hatterhat
2d32c47743 so i forgot to change that over 2020-02-19 20:59:02 -06:00
kevinz000
49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin' 
Adds diethylamine and saltpetre to the biogenerator
 2020-02-19 19:03:35 -07:00
Arturlang
796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Winter Flare
ed46d3ca1c Typo 2020-02-18 00:37:28 -05:00
Winter Flare
1a994e7f1e Ports Broom, Tweak Janitor Vendor 
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120

Makes Broom printable.

Reduces Broom sound effect.

Updates Janitor Vendor to have equipment for at least 2 janitors.
 2020-02-17 23:36:22 -05:00
Cameron!
28a589d2d1 diethylamine > ammonia 2020-02-17 04:32:39 -08:00
Cameron!
a4a5efbc11 ghommble's other changes 2020-02-16 15:48:22 -08:00
Cameron!
3ecd1b75d4 ghommald's changes 2020-02-16 15:32:05 -08:00
CameronWoof
206e546254 reordering these designs 2020-02-16 04:15:50 -08:00
CameronWoof
14e41e8d68 adds diethylamine and saltpetre to the biogenerator 2020-02-16 03:52:07 -08:00
necromanceranne
5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
Trilbyspaceclone
3fde58434f Merge branch 'master' into more_implants 2020-02-16 01:55:19 -05:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe 
Add two more pickaxes, Titanium & Plasteel
 2020-02-14 19:34:01 +01:00
Artur
c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 
Sprites, Tweaks, and Snacks, QoL
 2020-02-13 16:40:12 +01:00
TrilbySpaceClone
75844930b4 new implants! 2020-02-13 03:42:59 -05:00
Ghom
a7d29ae830 Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it 
Station Locked firing pins
 2020-02-13 09:42:22 +01:00
Artur
a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05:00
r4d6
8b68e57de0 Add the pickaxes 2020-02-10 22:02:39 -05:00
Seris02
e6aa47997c fix rcd cost 2020-02-10 16:00:21 +08: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
TrilbySpaceClone
5dbfc9a514 Yay 2020-02-08 03:25:09 -05:00
kappa-sama
8c2019fcbf probably fixes plant disk techdisk 2020-02-07 17:58:36 -05:00
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Hatterhat
385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
Hatterhat
e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Hatterhat
471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00
Hatterhat
81cf670729 shit whoops 2020-02-01 13:22:16 -06:00
Hatterhat
be525e3f58 good ol twoliner prs 2020-01-31 20:05:27 -06:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Ghom
3ce27d6c36 Merge pull request #10638 from Hatterhat/patch-3 
compact defibs have a properly set departmental flag now
 2020-01-23 02:51:17 +01:00