shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,805 Commits 5 Branches 0 Tags
edcdb531cccf3fcd08e8dfd1399ab607627cdfe0
Commit Graph

100 Commits

Author SHA1 Message Date
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
kevinz000
f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274 
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
 2020-02-05 01:10:21 -07:00
TrilbySpaceClone
06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
Trilbyspaceclone
8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
Trilbyspaceclone
e237fefbf4 Update science.dm 2020-02-04 06:45:37 -05:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
Trilbyspaceclone
6b2a8d49c9 Update science.dm 2020-02-02 01:39:25 -05:00
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
YakumoChen
6c3069e944 less empty line 2020-01-31 14:15:13 +00:00
YakumoChen
32f3b31127 adds two crates 2020-01-31 08:54:07 -05:00
kevinz000
9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00
Ghom
fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
Ghom
362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
Winter Flare
5883124e0d Removals. 
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
 2020-01-27 20:47:28 -05:00
Winter Flare
24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
kevinz000
c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000
91e8bec81a woops 2020-01-27 17:45:13 -07:00
Winter Flare
6e7d079928 Changed Dirty Mags and Candle 2020-01-27 19:34:33 -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
kevinz000
68227dcdb1 Update misc.dm 2020-01-27 03:53:50 -07:00
kevinz000
fa2cc0cfdf adds 2020-01-27 03:39:27 -07:00
necromanceranne
52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
r4d6
96c0a86b5f Make the Radiation Hardsuit a Voidsuit instead 2020-01-22 13:17:29 -05:00
Trilbyspaceclone
181984f478 Update materials.dm 2020-01-21 09:31:38 -05:00
Seris02
afd848e45a weh 2020-01-20 10:29:09 +08:00
Trilbyspaceclone
2b2e694341 Update code/modules/cargo/packs/science.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-17 15:56:09 -05:00
r4d6
ee33e36e6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-12 12:46:30 -05:00
Trilbyspaceclone
f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
Trilbyspaceclone
9d21a0e000 oil blood b gone 2020-01-05 09:57:11 -05:00
Trilbyspaceclone
bd42f20047 Update organic.dm 2020-01-04 20:11:10 -05:00
Trilbyspaceclone
2d573c3f7a carpets are misc 2020-01-04 20:06:54 -05:00
Trilbyspaceclone
67afcc13db Update misc.dm 2020-01-04 20:01:44 -05:00
Hatterhat
c0e010c612 e 2020-01-04 16:44:11 -06:00
Hatterhat
97242050ec bad idea 2020-01-04 02:16:55 -06:00
Hatterhat
7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
r4d6
8b760f5f3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-03 21:01:31 -05:00
Trilbyspaceclone
2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
r4d6
be62bbc96d Lowering price and change description 2019-12-31 18:17:07 -05:00
r4d6
81a39aa324 Add the space radsuit and the crate 2019-12-31 13:25:09 -05:00
kappa-sama
c0bc53ea81 more 2019-12-31 01:43:42 -05:00
kappa-sama
970814adbc it begins 2019-12-31 01:42:07 -05:00
Seris02
2ca4c2e66a tiny fixes 2019-12-30 18:53:00 +08:00
Seris02
714f76c8aa more changes 2019-12-30 18:48:29 +08:00
TrilbySpaceClone
8aee20cdf3 Ready 2019-12-28 17:55:20 -05:00
Trilbyspaceclone
ddd3676903 Merge branch 'master' into glassware 2019-12-17 15:18:30 -05:00
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05:00
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00