shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

278 Commits

Author SHA1 Message Date
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
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
2b429a93d2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737 2020-05-10 06:30:41 +02:00
Ghommie
015660c806 Trilby's grammar is a F- 2020-05-10 06:21:29 +02:00
Ghommie
c4c4285b00 Reorganizing techweb nodes in a subfolder. 2020-05-10 06:20:04 +02:00
Hatterhat
6067370a6f shotgun shell clips (#11955) 
* shell clips revised by based ghom

* lmao yeet better not forget that bit

* nitpicking but also merge 11976 first

* No freeloaders.

* Update weapon_designs.dm

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-09 02:49:25 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
DeltaFire
1a6f5eb131 If it compiles it works 
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
 2020-04-23 15:15:26 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +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
kevinz000
62418d3fb8 Merge pull request #11909 from Putnam3145/owai-broom-mop 
Adds more service stuff to lathes.
 2020-04-20 11:43:30 -07:00
Putnam
14a5985891 Adds more service stuff to lathes. 2020-04-17 23:00:05 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
TrilbySpaceClone
4419dc13f5 changes and additons 2020-04-14 22:17:53 -04:00
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
Trilbyspaceclone
f1deea99f7 adds back in the containment bag 2020-04-08 05:38:36 -04:00
Ghommie
736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
Seris02
5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
Trilbyspaceclone
aad3953355 Update all_nodes.dm 2020-03-12 20:52:07 -04:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Trilbyspaceclone
178de5ee0d Merge branch 'master' into more_crates+bags 2020-03-06 06:31:54 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
Ghom
44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens! 
Removed unused techweb var - Cargo selling of Techwebs nodes
 2020-03-06 01:21:09 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05: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
TrilbySpaceClone
c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
Trilbyspaceclone
becdd3c4c1 Merge branch 'master' into more_crates+bags 2020-02-22 18:33:26 -05:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08: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
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
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
Seris02
2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe 
Add two more pickaxes, Titanium & Plasteel
 2020-02-14 19:34:01 +01:00
Trilbyspaceclone
7650f9d45e shield b gone 2020-02-13 14:20:31 -05: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
47709a7ea8 forgot the shield implant 2020-02-13 03:52:41 -05:00
TrilbySpaceClone
75844930b4 new implants! 2020-02-13 03:42:59 -05:00
r4d6
8b68e57de0 Add the pickaxes 2020-02-10 22:02:39 -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
TrilbySpaceClone
5dbfc9a514 Yay 2020-02-08 03:25:09 -05:00
Trilbyspaceclone
980d26df76 Cadaver Management 2020-02-06 02:48:30 -05:00
Seris02
ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
Hatterhat
385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00