shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,221 Commits 5 Branches 0 Tags
afff7472d6def28b433fa86c1bc53b3574ad85fd
Commit Graph

570 Commits

Author SHA1 Message Date
Ghommie
afff7472d6 ok 2020-06-08 07:39:48 +02:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Detective Google
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
Lin
fc77954be3 Merge pull request #12290 from Ghommie/Ghommie-cit767 
Certain cargo packs (mostly armory/security) can not be privately purchased anymore.
 2020-05-19 05:15:12 +00:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
Ghommie
58432dd6be Thanks Trilby. 2020-05-18 03:21:02 +02:00
Ghommie
2eb3089ccb Certain packs (mostly armory/security) can not be privately bought anymore. 2020-05-17 23:38:26 +02:00
Trilbyspaceclone
2e1cc498a3 corrects WT-550 ammo to state 32 rather then 20 (#12275) 2020-05-17 01:05:24 +02:00
Trilbyspaceclone
c6c4d61ee3 Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975) 
* Baby wheels off

* Oh god factorio is dead!

* Gas-p the nerfs!

* Update gear.dm

* tools

* Update large_objects.dm
 2020-05-15 03:57:28 +02:00
Trilbyspaceclone
899c5a4575 Corrects evey storge with storage (#12220) 
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 21:21:11 +02:00
Detective Google
e2ddfcf77b Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-13 00:56:25 -05:00
Trilbyspaceclone
871361936c Replaces mosins in russian crates with 10mm surplus rifles (#12176) 
* Update security.dm

* Update armory.dm

* desc

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 05:35:01 +02:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
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
Detective Google
bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05: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
Detective Google
1d298232eb adds Snowmobiles, (ATVs that move fullspeed on snow and slow on plating) 2020-05-09 20:06:25 -05: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