shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,455 Commits 5 Branches 0 Tags
2b4b626facaefedebbbcea6f15080b08ecf6c194
Commit Graph
114 Commits
Author SHA1 Message Date
GhomandGitHub 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
TrilbyspacecloneandGitHub 8f653b4dd6 Update materials.dm 2020-02-17 15:48:31 -05:00
TrilbyspacecloneGitHubGhom
 		3b82e34db6 Update code/modules/cargo/packs/emergency.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-17 15:48:02 -05:00
TrilbyspacecloneandGitHub c5eaac62bd Update materials.dm 2020-02-16 18:26:22 -05:00
TrilbyspacecloneandGitHub 0315802330 Update armory.dm 2020-02-16 18:25:54 -05:00
TrilbyspacecloneandGitHub 0f7618b348 Update organic.dm 2020-02-16 14:07:00 -05:00
Persi 18feba7fdd Defusal kits are now emag only and don't require a drop pod console. 2020-02-16 00:14:15 -05:00
Persi 0c9244f669 Clarifies comments and locks defusal kits behind an emag 2020-02-15 14:17:22 -05:00
TrilbyspacecloneandGitHub 4b880276d8 Update emergency.dm 2020-02-12 14:41:38 -05:00
TrilbyspacecloneandGitHub d49a53e193 Update costumes_toys.dm 2020-02-08 22:17:58 -05:00
TrilbyspacecloneandGitHub 1e2562ed02 Update organic.dm 2020-02-08 18:59:00 -05:00
TrilbySpaceClone e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
kevinz000andGitHub 3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice 
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
 2020-02-06 23:52:49 -07:00
kevinz000andGitHub d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate 
Almost all venders now can be restocked
 2020-02-05 23:44:30 -07:00
kevinz000andGitHub 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
TrilbyspacecloneandGitHub 8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
TrilbyspacecloneandGitHub e237fefbf4 Update science.dm 2020-02-04 06:45:37 -05:00
kevinz000andGitHub c94b5688db Merge pull request #10810 from YakumoChen/ring 
Adds ring jewelry
 2020-02-02 03:16:01 -07:00
TrilbyspacecloneandGitHub 6b2a8d49c9 Update science.dm 2020-02-02 01:39:25 -05:00
GhomandGitHub 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
YakumoChenandGitHub 6c3069e944 less empty line 2020-01-31 14:15:13 +00:00
YakumoChenandGitHub 32f3b31127 adds two crates 2020-01-31 08:54:07 -05:00
necromanceranne 43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
kevinz000andGitHub 9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00
GhomandGitHub fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass 
6 More Crates
 2020-01-28 18:08:58 +01:00
GhomandGitHub 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
kevinz000andGitHub c665d971c0 Update misc.dm 2020-01-27 17:45:35 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
TrilbyspacecloneandGitHub 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
TrilbyspacecloneandGitHub 181984f478 Update materials.dm 2020-01-21 09:31:38 -05:00
Seris02 afd848e45a weh 2020-01-20 10:29:09 +08:00
TrilbyspacecloneGitHubGhom
 		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
TrilbyspacecloneandGitHub f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
TrilbyspacecloneandGitHub 9d21a0e000 oil blood b gone 2020-01-05 09:57:11 -05:00
TrilbyspacecloneandGitHub bd42f20047 Update organic.dm 2020-01-04 20:11:10 -05:00
TrilbyspacecloneandGitHub 2d573c3f7a carpets are misc 2020-01-04 20:06:54 -05:00
TrilbyspacecloneandGitHub 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