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

632 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
nik707
1132b75392 Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76 
Removes duplicate definition of games and toys nodes and readds autoylathe
 2019-08-29 19:53:37 -05:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
kevinz000
3f6256d945 Update all_nodes.dm 2019-08-21 08:06:08 -07:00
kevinz000
ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals 
Nanite Adv toxin healing now heals slimes
 2019-08-18 23:33:02 -07:00
kevinz000
f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff 
Service QoL
 2019-08-16 17:03:11 -07:00
Arturlang
b7ae88b6e3 Made it sound a bit nicer 2019-08-16 19:40:22 +03:00
Arturlang
2ca6464242 Update healing.dm 2019-08-16 15:32:08 +03: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
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
Sishen
dc66446064 dab dab 2019-08-09 03:19:02 -04:00
Ghommie
12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
Ghommie
d9a09d7211 Undoes a few things. 2019-07-31 21:23:20 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Trilbyspaceclone
a2b35d71fa port-part1 2019-07-28 08:07:44 -04:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
deathride58
edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55 
nanite metabolic synthesis now drains you until you're starving
 2019-07-17 17:55:27 -04:00
deathride58
80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53 
adds an adminspawned nanite hub that draws from admin techweb datum instead
 2019-07-17 17:50:46 -04:00
deathride58
51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51 
Makes aggressive replication not useless
 2019-07-17 17:49:08 -04:00
deathride58
8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56 
Nerfs chain detonation (removes dev radius)
 2019-07-17 17:47:36 -04:00
deathride58
c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59 
Nerfs nanite armor
 2019-07-17 17:46:41 -04:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Trilbyspaceclone
2a78caa127 Merge branch 'master' into Unmodular 2019-07-14 18:27:37 -04:00
kevinz000
1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools 
Adds more bronze tools
 2019-07-14 14:48:27 -07:00
kevinz000
705b12fc50 Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup 
Brakes up Blue space Rnd tech nodes
 2019-07-14 14:20:03 -07:00
kevinz000
33250dfcbe buffs it a bit 2019-07-14 14:16:44 -07:00
kevinz000
0adb33474d Update buffing.dm 2019-07-14 03:24:59 -07:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
239d688fe4 Update weapon.dm 2019-07-10 22:47:29 -07:00
kevinz000
05a01fe028 Update nanite_program_hub.dm 2019-07-10 22:11:16 -07:00
kevinz000
84d6fbe249 Update weapon.dm 2019-07-10 22:00:28 -07:00
kevinz000
a9c41c0fc7 hm 2019-07-10 10:00:45 -07:00
kevinz000
c14a052eeb Update weapon.dm 2019-07-10 03:06:32 -07:00
Trilbyspaceclone
f37e1bf01b Merge branch 'master' into Unmodular 2019-07-09 03:14:49 -04:00
kevinz000
fafac3fba6 Update utility.dm 2019-07-08 23:45:21 -07:00
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
deathride58
42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
deathride58
59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix 
Fixes trauma healing nanites.
 2019-07-08 18:07:04 -04: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
kevinz000
f541357a2c Update utility.dm 2019-07-07 00:30:33 -07:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00