Putnam
7003080440
Merge branch 'master' into fix-nanites
2019-10-12 02:36:51 -07:00
Putnam
c389099a47
Makes brain-healing nanites not work uselessly
2019-10-11 23:58:34 -07:00
kevinz000
b0b274762c
Merge pull request #9441 from lolman360/whydowehave1000branches
...
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
kevinz000
89747a3a6e
Merge pull request #9368 from Seris02/master
...
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
2019-10-10 02:18:25 -07:00
kevinz000
f686ea75d3
Merge pull request #8615 from Ghommie/Ghommie-cit45
...
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096
Merge pull request #8401 from Ghommie/Ghommie-cit11
...
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
Ghommie
735755019e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-09 01:18:30 +02:00
lolman360
2709570f01
techwebs and stuff i forgot
...
i am not a 1 commit wonder
2019-10-08 20:02:26 +11:00
kevinz000
fe1a78f413
Merge pull request #9421 from Ghommie/Ghommie-cit218
...
Porting some spraycan fixes and tweaks.
2019-10-08 00:34:58 -07: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
kevinz000
26b076c5aa
Merge pull request #9314 from Trilbyspaceclone/patch-228
...
Makes blood gun take 1/4 the blood to use
2019-10-08 00:29:41 -07: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
kevinz000
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
Ghommie
8228e52f43
Ports "Makes the illegal tech node harder to unlock"
2019-10-07 06:19:48 +02:00
Ghommie
f01f00710f
Porting some spraycan fixes.
2019-10-06 05:30:16 +02:00
Ghommie
cac4157894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-10-05 18:22:43 +02:00
Seris02
89277e6206
Merge pull request #2 from Citadel-Station-13/master
...
updating fork from browser
2019-10-01 22:11:14 +08:00
kevinz000
250c6ed986
Merge pull request #9367 from Poojawa/totally-radical
...
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Seris02
1bfbf790e7
Update xenobiology.dm
2019-09-28 18:42:47 +08:00
Poojawa
9bd6f83034
Applies rad_flags to a lot of common items + bluespace bags
...
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05: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
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
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
Trilbyspaceclone
cce3889abb
1/4 the blood taken rate
2019-09-19 08:39:17 -04: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
Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01: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
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Ghommie
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02: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
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
Ghommie
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +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
