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

537 Commits

Author SHA1 Message Date
Ghom 10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329 
Six new Sci based bounties!
 2020-04-16 19:06:48 +02: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
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Trilbyspaceclone 9bf84aca32 grammar 2020-04-09 13:18:55 -04: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
kevinz000 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
Trilbyspaceclone 97dbd6ae7f Update parts.dm 2020-04-07 18:38:53 -04:00
TrilbySpaceClone b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04: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
Trilbyspaceclone 8e64664295 Update science.dm 2020-04-07 03:45:23 -04:00
Trilbyspaceclone 45892cef79 Update science.dm 2020-04-03 23:33:15 -04:00
necromanceranne 0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11: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
Hatterhat 1e10a042be arrow craft nitpicking (alt title: "why are subtypes like this") (#11516) 
* subtypes (tm)

* ok fine jeez

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-18 19:34:14 +01:00
Trilbyspaceclone 487c18cb7e Update misc.dm 2020-03-13 14:20:28 -04:00
kevinz000 832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20 
Food Ports / Butter Bear / Food Craft Speed
 2020-03-10 05:59:24 -07: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
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Kraseo ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
Ghommie f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Kraseo ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo 38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01: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
kevinz000 6df64da7d6 Merge pull request #11133 from Citadel-Station-13/Ghommie-patch-2 
Nerfs the fermenting barrel export industry & co.
 2020-02-19 19:00:02 -07:00
kevinz000 b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 
Something about pAIs and silicon access priviledges.
 2020-02-19 18:59:10 -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
Ghom 4d39bae16b Merge pull request #11103 from PersianXerxes/cargoTraitorObjectivesRDumb 
Clarifies comments and locks defusal kits behind an emag
 2020-02-19 02:09:02 +01:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +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
Ghom eddefd4d25 Update large_objects.dm 2020-02-17 15:07:17 +01:00
Ghom a2583f5f7f Update expressconsole.dm 2020-02-17 14:25:50 +01: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 23a9b9b438 Master got fixed while I was at work! 2020-02-16 00:07:24 -05:00
Trilbyspaceclone 470e786765 Update expressconsole.dm 2020-02-15 15:59:09 -05:00
Persi 0c9244f669 Clarifies comments and locks defusal kits behind an emag 2020-02-15 14:17:22 -05: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
Ghommie 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00