shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,761 Commits 5 Branches 0 Tags
8f44cf13054a30638fb8edf8564d7643e4afc749
Commit Graph

134 Commits

Author SHA1 Message Date
kevinz000 7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722 
Removing cargo "paperwork" and a few other bloat packs.
 2020-05-07 09:11:45 -07:00
Putnam 801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
Ghommie 65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04: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
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Ghommie 39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Artur 2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
UristMcAstronaut ec734475cc Add files via upload 2020-04-14 16:21:30 +00:00
kappa-sama efe36a02e0 bye 2020-04-12 22:19:10 -04:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000 8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Ghom 993548ad0e Update emergency.dm 2020-03-31 04:18:35 +02:00
Trilbyspaceclone 29fc535da8 Update code/modules/cargo/packs/emergency.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 22:01:16 -04:00
Trilbyspaceclone 5a10b1cc8f Imagine correcting nothing 2020-03-30 05:53:16 -04:00
necromanceranne aa01c30656 Removes some weapons and crates that shouldn't have been added, like, ever (#11673) 2020-03-29 17:22:03 +02:00
necromanceranne 3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Trilbyspaceclone 487c18cb7e Update misc.dm 2020-03-13 14:20:28 -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 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 8f653b4dd6 Update materials.dm 2020-02-17 15:48:31 -05:00
Trilbyspaceclone 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
Trilbyspaceclone c5eaac62bd Update materials.dm 2020-02-16 18:26:22 -05:00
Trilbyspaceclone 0315802330 Update armory.dm 2020-02-16 18:25:54 -05:00
Trilbyspaceclone 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
Trilbyspaceclone 4b880276d8 Update emergency.dm 2020-02-12 14:41:38 -05:00
Trilbyspaceclone d49a53e193 Update costumes_toys.dm 2020-02-08 22:17:58 -05:00
Trilbyspaceclone 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
kevinz000 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
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
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
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