Poojawa
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
kevinz000
7c94029006
Merge pull request #9431 from Ghommie/Ghommie-cit221
...
Ports "Makes the illegal tech node harder to unlock"
2019-10-07 23:35:18 -07:00
Ghommie
8228e52f43
Ports "Makes the illegal tech node harder to unlock"
2019-10-07 06:19:48 +02:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01: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
kevinz000
7d192c305a
Merge pull request #9306 from kappa-sama/voidcell
...
Abductor batteries can be used to unlock abductor research
2019-09-21 01:39:08 -07: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
kappa-sama
34d109f6a2
on further thought, all of them
2019-09-18 17:12:06 -04:00
kappa-sama
9bdbf444e4
abductor batteries to tech tree
2019-09-18 17:09:24 -04:00
TrilbySpaceClone
5ecf68918b
tada
2019-09-18 03:47:52 -04:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05: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
kevinz000
3f6256d945
Update all_nodes.dm
2019-08-21 08:06:08 -07:00
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
Linzolle
2095a14256
add mining shuttle console to techweb
2019-08-12 13:49:26 -05:00
Poojawa
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
Sishen
dc66446064
dab dab
2019-08-09 03:19:02 -04:00
Poojawa
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05: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
Poojawa
7d65ddb417
bug blood, ipc/slime hearts, blood gen protolathe
...
we're all gucchi now boys
2019-08-04 04:07:44 -05: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
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Trilbyspaceclone
2a78caa127
Merge branch 'master' into Unmodular
2019-07-14 18:27:37 -04:00
Trilbyspaceclone
53c61b9050
Merge branch 'master' into Rnd_brakeup
2019-06-23 21:09:53 -04:00
Trilbyspaceclone
063fe4fdef
Merge branch 'master' into Unmodular
2019-06-23 21:06:21 -04:00
Fermi
fdba8c000f
Fixing compiling errors.
2019-06-23 20:03:37 +01:00
Fermi
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
TrilbySpaseClone
8879cdc24e
Update all_nodes.dm
2019-06-22 14:10:29 -04: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
55fbbd8a3f
Merge branch 'master' into Unmodular
2019-06-16 20:02:56 -04:00
TrilbySpaseClone
b45c870ae4
Immodular
2019-06-16 19:58:49 -04:00
kevinz000
d3555d6782
Merge pull request #8243 from Trilbyspaceclone/meteor
...
More Meteor defenses
2019-06-16 01:01:43 -07:00
Trilbyspaceclone
f32291146b
Update all_nodes.dm
2019-06-14 12:02:55 -04:00
BlackMajor
7523c86071
Wasn't I supposed to do this in January
2019-06-10 22:55:38 +12:00
Trilbyspaceclone
0d7b769eee
Merge branch 'master' into meteor
2019-06-09 17:01:06 -04:00
Trilbyspaceclone
b073c29b19
Update all_nodes.dm
2019-06-08 16:17:49 -04:00
Fermi
f44b9048af
Added to vendors/tech.
2019-06-08 01:00:51 +01:00
Fermi
40aa231b64
Made MKUltra's OD on self turn the player into a narcissist.
2019-06-01 04:31:34 +01:00
Fermi
2eceb6f57b
Added a cybernetic tongue and sprites. Fixed furranium.
2019-06-01 01:28:52 +01:00
Fermi
a1afeb880f
Final testing. Added pH meter too. Compile safe.
2019-05-27 15:00:19 +01:00
CdrCross
82d308eb5e
Defibrillator Upgrades Proofread
...
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
2019-05-21 23:37:28 +02:00
