shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

72 Commits

Author SHA1 Message Date
SiliconMain a26590965e Update misc_designs.dm 2021-01-12 14:41:10 -06:00
Neko Boi Nick 6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Timothy Teakettle 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle 95b8cd3956 first port 2020-06-10 20:33:01 +01:00
shellspeed1 2002a273de Makes empty internal tanks printable 2020-06-04 16:04:16 -07:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghom 5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Putnam 14a5985891 Adds more service stuff to lathes. 2020-04-17 23:00:05 -07:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03: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
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
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
kappa-sama 8c2019fcbf probably fixes plant disk techdisk 2020-02-07 17:58:36 -05: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
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
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 0773f1b7fa sweet merciful FUCK what is this merge 2020-01-12 02:53:30 -06:00
kevinz000 60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
Hatterhat 04aa0eda5a tg 40046, 41695, 46726 - hope i didnt forget smth 2020-01-09 18:35:13 -06:00
r4d6 7c757900f2 Fix the category 2020-01-07 13:27:44 -05:00
r4d6 a91f31d9e6 Fix a typo 2020-01-07 11:21:00 -05:00
r4d6 4e528da5c2 Correct price and rpd 2020-01-04 19:06:56 -05:00
r4d6 221cb980d6 forgot a / 2020-01-03 03:25:53 -05:00
r4d6 880db10033 Forgot some more mats 2020-01-03 03:22:18 -05:00
r4d6 aedf634355 Fix mats. 2020-01-03 03:15:30 -05:00
r4d6 3f5d4ad835 remove a duplicate comment 2020-01-03 03:13:03 -05:00
r4d6 58a986696f Add RCD and RPD to Engie's protolathe 
Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289
 2020-01-03 02:46:25 -05:00
r4d6 5c94e02eac Add simple RCD Circuits 
Port : https://github.com/tgstation/tgstation/pull/45357
 2020-01-03 02:32:43 -05:00
Seris02 61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
Fermi ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
Fermi aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
Fermi 9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi 0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi 00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
Fermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi aca5454bac Diamon to plastic since someone said if you have diamonds you have T4. 2019-09-21 04:26:36 +01:00
kevinz000 09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
Winter Flare 141a93236c Service QoL 
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
 2019-08-14 04:01:18 -04:00
Sishen dc66446064 dab dab 2019-08-09 03:19:02 -04:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Thalpy cf225f335a Forgot to rename the box. 2019-07-01 00:18:35 +01:00