shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,498 Commits 5 Branches 0 Tags
cbf02e76a44ef04652df87ab0c4e68e720183e21
Commit Graph

266 Commits

Author SHA1 Message Date
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
lolman360
2709570f01 techwebs and stuff i forgot 
i am not a 1 commit  wonder
 2019-10-08 20:02:26 +11:00
kevinz000
6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2 
Unmodulars a few things + new sprite + new welder tank(unused
 2019-10-08 00:30:54 -07:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
TrilbySpaceClone
45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood 
Its a blood bath! A BlueSpace Blood Bath!
 2019-09-21 01:39:29 -07:00
Fermi
2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
Fermi
b9a2a5ce38 Oops 2019-09-19 15:41:26 +01:00
Fermi
a398f64b66 Okay 2019-09-19 15:33:40 +01:00
XDTM
023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTM
8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
TrilbySpaceClone
5ecf68918b tada 2019-09-18 03:47:52 -04:00
Poojawa
4a4fe8c03c Adding snowflake to limbgrower 2019-09-12 00:59:28 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
TrilbySpaceClone
17f6304acf hm 2019-09-11 06:54:50 -04:00
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
TrilbySpaceClone
36695d556f Lets have all the ammo and kegs together 2019-08-31 15:38:26 -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