shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,843 Commits 5 Branches 0 Tags
4aca1e8f62017003beea9253f5feaaa52c472ce5
Commit Graph

554 Commits

Author SHA1 Message Date
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Trilbyspaceclone
b019915d10 Removes alien crate adds ape crate (#12178) 
* Update science.dm

* Update snacks_meat.dm

* Update science.dm

* Apply suggestions from code review

kinda didnt want to just take tg's ape cubes but what ever

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:10:45 +02:00
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
Ghom
bdbe6c062e Fixing a cargo exploit 2020-05-02 19:11:30 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +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
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie
e0d219650f Ready for testing. 2020-04-21 01:26:34 +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
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghom
10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329 
Six new Sci based bounties!
 2020-04-16 19:06:48 +02:00
Artur
ddcfcb5cd8 Conflicts sure are !!FUN!! 
Also adds dolphin gloves to the glove crate, and fixes fortitude
 2020-04-15 12:33:59 +03: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
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03: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