shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,978 Commits 5 Branches 0 Tags
166370fb6c62beb8cc8488710c9ffbf9c511ff1c
Commit Graph

231 Commits

Author SHA1 Message Date
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
kevinz000
f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting 
Frail crafting - Glass work additions and changes!
 2020-04-09 02:41:01 -07:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
Ghommie
f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
Ghommie
983d7826b6 Ports "Fixes vault and high security door material exploit and tweaks high security door cost" 2020-03-29 00:51:16 +01:00
Trilbyspaceclone
f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-24 14:03:31 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghom
c4597bc570 Update sheet_types.dm 2020-03-16 16:59:37 +01:00
Trilbyspaceclone
a2baa47600 50 commits of hell 2020-03-12 21:27:12 -04:00
Trilbyspaceclone
7b02915cc7 Update sheet_types.dm 2020-03-12 21:24:20 -04:00
Winter Flare
bb9066e9cb Food Additions / Butter Bear 
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
 2020-03-08 14:36:08 -04:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Trilbyspaceclone
178de5ee0d Merge branch 'master' into more_crates+bags 2020-03-06 06:31:54 -05:00
Ghom
976080d7b2 Merge pull request #11314 from KathrinBailey/Kat-Furniture 
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
 2020-03-04 15:40:01 +01:00
KathrinBailey
97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
Trilbyspaceclone
d32b6ad7e9 ok 2020-03-03 08:47:17 -05:00
KathrinBailey
a240daaca2 Final changes 
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
 2020-03-03 13:19:15 +00:00
KathrinBailey
d817442f02 It works! 
Everything works now.
 2020-03-01 13:42:14 +00:00
KathrinBailey
72d3572ec3 New sofas added, need to be added to sheet_types.dm still 
Backing up the .dmi changes and two comfy chairs.
 2020-03-01 11:58:59 +00:00
Trilbyspaceclone
71c26c287e Update sheet_types.dm 2020-03-01 01:55:03 -05:00
Trilbyspaceclone
612f8d97d5 Update sheet_types.dm 2020-02-29 03:29:08 -05:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05:00
Trilbyspaceclone
becdd3c4c1 Merge branch 'master' into more_crates+bags 2020-02-22 18:33:26 -05:00
Hatterhat
accc4ce776 grammar shit, silkstring buff, arrow costs, yikes 2020-02-22 15:33:07 -06: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
kevinz000
6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
Ghom
0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4 
Corrects a few cargo crates/exports (and nerfs some)
 2020-02-19 02:10:25 +01:00
TrilbySpaceClone
a1f1a01a81 grammer and quiver 2020-02-15 00:52:19 -05:00
TrilbySpaceClone
bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
Winter Flare
5549cd93f1 Merge branch 'master' into tinytweaks-2-9-20 2020-02-11 07:20:16 -05:00
Trilbyspaceclone
5df75aee57 Update code/game/objects/items/stacks/sheets/sheet_types.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-10 23:59:16 -05:00
kevinz000
5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby 
Adds more Alien disco
 2020-02-10 04:14:18 -07: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
e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05:00
TrilbySpaceClone
76219e0188 Primortial 2020-02-08 02:21:14 -05:00
TrilbySpaceClone
c8dff8fbc5 it just works 2020-02-04 04:18:44 -05: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
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Trilbyspaceclone
4625d4f25d Update sheet_types.dm 2020-02-01 01:56:41 -05:00
Trilbyspaceclone
fa40490915 Update sheet_types.dm 2020-02-01 01:08:14 -05:00
Winter Flare
21fe8be5dc Mmmmm, more crates. 
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
 2020-01-27 07:00:40 -05:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Ghommie
c93f16e4d4 Unused variable. 2020-01-21 00:45:51 +01:00
Ghommie
ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
TrilbySpaceClone
92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00