shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

250 Commits

Author SHA1 Message Date
kevinz000
8f577e910a Merge pull request #9238 from Trilbyspaceclone/surgery_stuff 
Adds two more surgerys - Embalming and Body Rejuvenation
 2019-09-07 11:37:13 -07:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
kevinz000
f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff 
Service QoL
 2019-08-16 17:03:11 -07:00
Winter Flare
141a93236c Service QoL 
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
 2019-08-14 04:01:18 -04:00
Linzolle
13b3552e64 i'm dumb 2019-08-12 14:37:48 -05:00
Linzolle
2095a14256 add mining shuttle console to techweb 2019-08-12 13:49:26 -05:00
Sishen
dc66446064 dab dab 2019-08-09 03:19:02 -04:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000
1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools 
Adds more bronze tools
 2019-07-14 14:48:27 -07:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
kevinz000
1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101 
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
 2019-07-07 02:39:07 -07:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Thalpy
cf225f335a Forgot to rename the box. 2019-07-01 00:18:35 +01:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Thalpy
937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Sishen
3aaed75a95 Update smelting_designs.dm 2019-06-29 04:49:29 -04:00
Trilbyspaceclone
75fa9d633c Update autolathe_designs_tools.dm 2019-06-28 21:56:17 -04:00
deathride58
fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78 
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
 2019-06-28 00:47:09 -04:00
Trilbyspaceclone
e9f36b79bb Merge branch 'master' into meme_tools 2019-06-23 21:07:55 -04:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Ghommie
138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
TrilbySpaseClone
51119ad6fd tools 2019-06-22 15:37:28 -04:00
Fermi
fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
Trilbyspaceclone
c5e3010cfa Update misc_designs.dm 2019-06-14 12:01:52 -04:00
Trilbyspaceclone
0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
Trilbyspaceclone
3b941210e5 Update medical_designs.dm 2019-06-08 16:16:17 -04:00
Fermi
3bb1a8dd00 OOPS. 2019-06-08 02:19:39 +01:00
Fermi
f44b9048af Added to vendors/tech. 2019-06-08 01:00:51 +01:00
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
kevinz000
1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137 
Allows bio genes to make synth meat
 2019-05-31 17:43:22 -07:00
Fermi
2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
kevinz000
f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T 
[Ready] Nerfs(Not really) Engi printing and organized many designs
 2019-05-30 11:12:35 -07:00
Fermi
79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
Fermi
a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01:00
Trilbyspaceclone
5b549f030d huh... 2019-05-26 04:50:19 -04:00
Trilbyspaceclone
a29aed136b Update misc_designs.dm 2019-05-25 18:25:01 -04:00
Trilbyspaceclone
df236fbda5 Update comp_board_designs.dm 2019-05-25 18:24:33 -04:00
Trilbyspaceclone
7b4ddd8965 Update comp_board_designs.dm 2019-05-25 18:24:19 -04:00
Trilbyspaceclone
c8734cebdc Update biogenerator_designs.dm 2019-05-25 16:35:50 -04:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 
[Ready] Cleaner looking autolathen organization
 2019-05-25 11:51:17 -07:00
Trilbyspaceclone
d1887d2431 Update comp_board_designs_medical.dm 2019-05-24 23:05:47 -04:00