Commit Graph

1072 Commits

Author SHA1 Message Date
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons 310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
DeltaFire 8b2044b407 another 2021-01-13 23:42:20 +01:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
DeltaFire 1a521b846f thanks 2021-01-13 23:39:36 +01:00
Lin 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
DeltaFire 6192d4ddab fixes 2021-01-13 00:08:59 +01:00
DeltaFire 4eab9e6520 why not 2021-01-11 18:06:43 +01:00
DeltaFire 8590d364e0 spellcheck 2021-01-11 02:18:58 +01:00
DeltaFire 2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
silicons 72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
DeltaFire 05f7991981 snap 2021-01-09 20:37:24 +01:00
Lin 5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
uomo91 6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
silicons 251bd3e06b logging 2020-12-31 12:33:05 -08:00
Letter N 1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
Timothy Teakettle 2ca997e339 fix 2020-12-21 20:19:26 +00:00
Letter N 2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
silicons c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
silicons f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire15 ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00
silicons a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
DeltaFire 410ffffcc3 there we go
robot rad safe: 250, 750 with upgrade (500 for normal mobs)

Also some typo fixes
2020-11-15 20:30:50 +01:00
DeltaFire 7c1a2808d1 tweaks purge corruption
Sleeping() > Unconscious()
2020-11-13 18:58:29 +01:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire 935c412629 specify 2020-11-13 02:25:51 +01:00
DeltaFire 5af48a22dd adds a surgery to fix corruption 2020-11-13 02:24:52 +01:00
Timothy Teakettle b6aa8c352e remove message 2020-11-08 16:50:09 +00:00
Timothy Teakettle 185939a09f stable version 2020-11-08 16:49:49 +00:00
Timothy Teakettle d358a170fa fixes 2020-11-08 14:32:10 +00:00
Timothy Teakettle 48ecffa8f4 Revert "Revert "fixes""
This reverts commit 2fb9dc88e7.
2020-11-08 12:48:00 +00:00
Timothy Teakettle 2fb9dc88e7 Revert "fixes"
This reverts commit a7e0bafde3.
2020-11-08 02:23:55 +00:00
Timothy Teakettle a7e0bafde3 fixes 2020-11-08 01:46:43 +00:00
Timothy Teakettle 022f996cfa better fix 2020-11-05 17:28:32 +00:00
DeltaFire f74bf6d94e no more accidental slapping I said!
Makes initiate() always return true if you do not finish the doafter, preventing certain issues (you walking away and therefore slapping them / starting to forcefeed a organ, etc)
2020-11-04 05:05:23 +01:00
DeltaFire c4b0f21fd2 buncha stuff
All tools now have the surgical tool flag (save for wires since those have force 0 anyways and are only used very rarely in surgery), but yeah, since we got far more species using robot surgeries (0 -> 3), might be good to not have them accidentally beaten up.
Also fixes organs being eaten after inserting them, yay!
2020-11-04 04:34:56 +01:00
timothyteakettle 8126eb5a12 fixes a lot of things 2020-11-02 23:07:27 +00:00
Timothy Teakettle db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
Timothy Teakettle 22823f629d an actual fix 2020-11-01 20:40:08 +00:00
DeltaFire 04f0bb2fc2 clarifications
Now, you don't have to play the guessing game with the prepare electronics / open the hatch somewhat ambiguous surgery steps.
2020-11-01 03:23:34 +01:00
DeltaFire a07ab809ff fixes a thing
Previously, if a wound was removed while there wasa  surgery related to it going on, it'd just qdel() the surgery, which is.. kinda weird, since it, y'know, takes the closing step away from you, and all wound surgeries have checks for no wound being present anyways.
2020-10-31 18:04:59 +01:00
Timothy Teakettle e78383f4fa typo 2020-10-30 19:42:02 +00:00
Timothy Teakettle f4f322dd0e better fix 2020-10-30 19:39:43 +00:00
DeltaFire 5f32fa88e9 biomech wound surgeries
Since IPCs and synths can get wounds, they should prooobably also have access to the surgeries to fix them. instead of having to use the super-slow ways.
2020-10-29 21:34:54 +01:00
Vynzill cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00