Merge branch 'master' into void-but-for-real
This commit is contained in:
kiwedespars
@@ -30845,6 +30845,7 @@
|
||||
/area/science)
|
||||
"bvF" = (
|
||||
/obj/machinery/requests_console{
|
||||
announcementConsole = 1;
|
||||
department = "Cargo Bay";
|
||||
departmentType = 2;
|
||||
pixel_x = -30
|
||||
|
||||
@@ -106349,10 +106349,10 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/blood,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/medical/surgery)
|
||||
"dyK" = (
|
||||
/obj/structure/closet/crate/freezer/blood,
|
||||
/obj/machinery/vending/wallmed{
|
||||
name = "Emergency NanoMed";
|
||||
pixel_x = 26;
|
||||
@@ -106368,6 +106368,7 @@
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/limbgrower,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/medical/surgery)
|
||||
"dyL" = (
|
||||
|
||||
@@ -37478,11 +37478,10 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/medbay/central)
|
||||
"bHb" = (
|
||||
/obj/structure/closet/crate/freezer/surplus_limbs,
|
||||
/obj/item/reagent_containers/glass/beaker/synthflesh,
|
||||
/obj/machinery/newscaster/security_unit{
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/machinery/limbgrower,
|
||||
/turf/open/floor/plasteel/freezer,
|
||||
/area/medical/surgery)
|
||||
"bHc" = (
|
||||
@@ -38110,6 +38109,8 @@
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/closet/crate/freezer/surplus_limbs,
|
||||
/obj/item/reagent_containers/glass/beaker/synthflesh,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/surgery)
|
||||
"bIq" = (
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
/datum/controller/subsystem/persistence/LoadServerPersistence()
|
||||
. = ..()
|
||||
LoadRecentModes()
|
||||
LoadRecentChaos()
|
||||
LoadRecentStorytellers()
|
||||
LoadRecentRulesets()
|
||||
LoadRecentMaps()
|
||||
@@ -85,6 +86,15 @@
|
||||
return
|
||||
saved_modes = json["data"]
|
||||
|
||||
/datum/controller/subsystem/persistence/proc/LoadRecentChaos()
|
||||
var/json_file = file("data/RecentChaos.json")
|
||||
if(!fexists(json_file))
|
||||
return
|
||||
var/list/json = json_decode(file2text(json_file))
|
||||
if(!json)
|
||||
return
|
||||
saved_chaos = json["data"]
|
||||
|
||||
/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
|
||||
var/json_file = file("data/RecentRulesets.json")
|
||||
if(!fexists(json_file))
|
||||
|
||||
@@ -477,6 +477,10 @@
|
||||
name = "Messy"
|
||||
icon_state = "hair_messy"
|
||||
|
||||
/datum/sprite_accessory/hair/messy2
|
||||
name = "Messy2"
|
||||
icon_state = "hair_messy2"
|
||||
|
||||
/datum/sprite_accessory/hair/modern
|
||||
name = "Modern"
|
||||
icon_state = "hair_modern"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/datum/boss_active_timed_battle/atb
|
||||
var/point_regen_delay = 20
|
||||
var/point_regen_amount = 1
|
||||
|
||||
sentience_type = SENTIENCE_BOSS
|
||||
|
||||
/mob/living/simple_animal/hostile/boss/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -809,22 +809,22 @@
|
||||
research_icon_state = "surgery_chest"
|
||||
|
||||
/datum/design/surgery/healing/brute_upgrade
|
||||
name = "Tend Wounds (Brute) Upgrade"
|
||||
name = "Tend Wounds (Brute) Upgrade I"
|
||||
surgery = /datum/surgery/healing/brute/upgraded
|
||||
id = "surgery_heal_brute_upgrade"
|
||||
|
||||
/datum/design/surgery/healing/brute_upgrade_2
|
||||
name = "Tend Wounds (Brute) Upgrade"
|
||||
name = "Tend Wounds (Brute) Upgrade II"
|
||||
surgery = /datum/surgery/healing/brute/upgraded/femto
|
||||
id = "surgery_heal_brute_upgrade_femto"
|
||||
|
||||
/datum/design/surgery/healing/burn_upgrade
|
||||
name = "Tend Wounds (Burn) Upgrade"
|
||||
name = "Tend Wounds (Burn) Upgrade I"
|
||||
surgery = /datum/surgery/healing/burn/upgraded
|
||||
id = "surgery_heal_burn_upgrade"
|
||||
|
||||
/datum/design/surgery/healing/burn_upgrade_2
|
||||
name = "Tend Wounds (Burn) Upgrade"
|
||||
name = "Tend Wounds (Burn) Upgrade II"
|
||||
surgery = /datum/surgery/healing/brute/upgraded/femto
|
||||
id = "surgery_heal_burn_upgrade_femto"
|
||||
|
||||
@@ -835,16 +835,26 @@
|
||||
id = "surgery_heal_combo"
|
||||
|
||||
/datum/design/surgery/healing/combo_upgrade
|
||||
name = "Tend Wounds (Mixture) Upgrade"
|
||||
name = "Tend Wounds (Mixture) Upgrade I"
|
||||
surgery = /datum/surgery/healing/combo/upgraded
|
||||
id = "surgery_heal_combo_upgrade"
|
||||
|
||||
/datum/design/surgery/healing/combo_upgrade_2
|
||||
name = "Tend Wounds (Mixture) Upgrade"
|
||||
name = "Tend Wounds (Mixture) Upgrade II"
|
||||
desc = "A surgical procedure that repairs both bruises and burns faster than their individual counterparts. It is more effective than both the individual surgeries."
|
||||
surgery = /datum/surgery/healing/combo/upgraded/femto
|
||||
id = "surgery_heal_combo_upgrade_femto"
|
||||
|
||||
/datum/design/surgery/healing/robot_upgrade
|
||||
name = "Repair Robotic Limbs Upgrade"
|
||||
surgery = /datum/surgery/robot_healing/upgraded
|
||||
id = "surgery_heal_robo_upgrade"
|
||||
|
||||
/datum/design/surgery/healing/robot_upgrade_2
|
||||
name = "Repair Robotic Limbs Upgrade II"
|
||||
surgery = /datum/surgery/robot_healing/upgraded/femto
|
||||
id = "surgery_heal_robo_upgrade_femto"
|
||||
|
||||
/datum/design/surgery/surgery_toxinhealing
|
||||
name = "Body Rejuvenation"
|
||||
desc = "A surgical procedure that helps deal with oxygen deprecation, and treat toxic damaged. Works on corpses and alive alike without chemicals."
|
||||
|
||||
@@ -43,7 +43,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
|
||||
|
||||
/obj/item/storage/part_replacer/bluespace
|
||||
name = "bluespace rapid part exchange device"
|
||||
desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts. Definitely not just a BSRPED painted orange."
|
||||
desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
|
||||
icon_state = "BS_RPED"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
works_from_distance = TRUE
|
||||
@@ -109,6 +109,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
|
||||
icon_state = "borgrped"
|
||||
|
||||
/obj/item/storage/part_replacer/bluespace/cyborg
|
||||
desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts. Definitely not just a BSRPED painted orange."
|
||||
icon_state = "borg_BS_RPED"
|
||||
|
||||
/proc/cmp_rped_sort(obj/item/A, obj/item/B)
|
||||
|
||||
@@ -116,6 +116,14 @@
|
||||
design_ids = list("surgery_heal_brute_upgrade","surgery_heal_burn_upgrade")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
|
||||
|
||||
/datum/techweb_node/adv_surgery
|
||||
id = "adv_surgery"
|
||||
display_name = "Advanced Surgery"
|
||||
description = "When simple medicine doesn't cut it."
|
||||
prereq_ids = list("imp_wt_surgery")
|
||||
design_ids = list("surgery_revival", "surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto","surgery_heal_robo_upgrade","surgery_heal_combo", "surgery_toxinhealing", "organbox", "surgery_adv_dissection")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
|
||||
|
||||
/datum/techweb_node/advance_surgerytools
|
||||
id = "advance_surgerytools"
|
||||
display_name = "Advanced Surgery Tools"
|
||||
@@ -124,20 +132,12 @@
|
||||
design_ids = list("drapes", "retractor_adv", "surgicaldrill_adv", "scalpel_adv", "bonesetter", "surgical_tape")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
|
||||
|
||||
/datum/techweb_node/adv_surgery
|
||||
id = "adv_surgery"
|
||||
display_name = "Advanced Surgery"
|
||||
description = "When simple medicine doesn't cut it."
|
||||
prereq_ids = list("imp_wt_surgery")
|
||||
design_ids = list("surgery_revival", "surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto", "surgery_heal_combo", "surgery_toxinhealing", "organbox", "surgery_adv_dissection")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
|
||||
|
||||
/datum/techweb_node/exp_surgery
|
||||
id = "exp_surgery"
|
||||
display_name = "Experimental Surgery"
|
||||
description = "When evolution isn't fast enough."
|
||||
prereq_ids = list("adv_surgery")
|
||||
design_ids = list("surgery_pacify","surgery_vein_thread","surgery_muscled_veins","surgery_nerve_splice","surgery_nerve_ground","surgery_ligament_hook","surgery_ligament_reinforcement","surgery_viral_bond", "surgery_exp_dissection", "surgery_heal_combo_upgrade")
|
||||
design_ids = list("surgery_pacify","surgery_vein_thread","surgery_muscled_veins","surgery_nerve_splice","surgery_nerve_ground","surgery_ligament_hook","surgery_ligament_reinforcement","surgery_viral_bond", "surgery_exp_dissection","surgery_heal_robo_upgrade_femto","surgery_heal_combo_upgrade")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
|
||||
|
||||
/datum/techweb_node/alien_surgery
|
||||
|
||||
@@ -394,7 +394,7 @@
|
||||
name = "smithed katana blade"
|
||||
finishingitem = /obj/item/swordhandle
|
||||
finalitem = /obj/item/melee/smith/twohand/katana
|
||||
icon_state = "katana"
|
||||
icon_state = "katana-s"
|
||||
|
||||
|
||||
/obj/item/smithing/katanablade/startfinish()
|
||||
|
||||
@@ -169,7 +169,6 @@
|
||||
/***************************COMBO***************************/
|
||||
/datum/surgery/healing/combo
|
||||
|
||||
|
||||
/datum/surgery/healing/combo
|
||||
name = "Tend Wounds (Mixture, Basic)"
|
||||
replaced_by = /datum/surgery/healing/combo/upgraded
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
//Almost copypaste of tend wounds, with some changes
|
||||
|
||||
/datum/surgery/robot_healing
|
||||
name = "Repair robotic limbs (basic)"
|
||||
name = "Repair Robotic Limbs"
|
||||
desc = "A surgical procedure that provides repairs and maintenance to robotic limbs. Is slightly more efficient when the patient is severely damaged."
|
||||
|
||||
replaced_by = /datum/surgery
|
||||
steps = list(/datum/surgery_step/mechanic_open,
|
||||
/datum/surgery_step/pry_off_plating,
|
||||
/datum/surgery_step/cut_wires,
|
||||
@@ -14,8 +14,28 @@
|
||||
possible_locs = list(BODY_ZONE_CHEST)
|
||||
requires_bodypart_type = 0 //You can do this on anyone, but it won't really be useful on people without augments.
|
||||
ignore_clothes = TRUE
|
||||
var/healing_step_type
|
||||
var/antispam = FALSE
|
||||
var/healing_step_type = /datum/surgery_step/robot_heal/basic
|
||||
|
||||
/datum/surgery/robot_healing/basic
|
||||
name = "Repair Robotic Limbs (Basic)"
|
||||
replaced_by = /datum/surgery/robot_healing/upgraded
|
||||
healing_step_type = /datum/surgery_step/robot_heal/basic
|
||||
desc = "A surgical procedure that provides basic repairs and maintenance to a patient's robotic limbs. Heals slightly more when the patient is severely injured."
|
||||
|
||||
/datum/surgery/robot_healing/upgraded
|
||||
name = "Repair Robotic Limbs (Adv.)"
|
||||
requires_tech = TRUE
|
||||
replaced_by = /datum/surgery/robot_healing/upgraded/femto
|
||||
healing_step_type = /datum/surgery_step/robot_heal/upgraded
|
||||
desc = "A surgical procedure that provides advanced repairs and maintenance to a patient's robotic limbs. Heals more when the patient is severely injured."
|
||||
|
||||
/datum/surgery/robot_healing/upgraded/femto
|
||||
name = "Repair Robotic Limbs (Exp.)"
|
||||
requires_tech = TRUE
|
||||
replaced_by = null // as good as it gets
|
||||
healing_step_type = /datum/surgery_step/robot_heal/upgraded/femto
|
||||
desc = "A surgical procedure that provides experimental repairs and maintenance to a patient's robotic limbs. Heals considerably more when the patient is severely injured."
|
||||
|
||||
/datum/surgery/robot_healing/New(surgery_target, surgery_location, surgery_bodypart)
|
||||
..()
|
||||
@@ -35,26 +55,21 @@
|
||||
var/healsburn = FALSE
|
||||
var/brutehealing = 0
|
||||
var/burnhealing = 0
|
||||
var/missinghpbonus = 0 //heals an extra point of damager per X missing damage of type (burn damage for burn healing, brute for brute). Smaller Number = More Healing!
|
||||
var/missinghpbonus = 0 //heals an extra point of damage per X missing damage of type (burn damage for burn healing, brute for brute). Smaller Number = More Healing!
|
||||
|
||||
/datum/surgery_step/robot_heal/tool_check(mob/user, obj/item/tool)
|
||||
if(implement_type == TOOL_WELDER && !tool.tool_use_check(user, 1))
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
/datum/surgery/robot_healing/can_start(mob/user, mob/living/carbon/target, obj/item/tool)
|
||||
var/possible = FALSE
|
||||
/datum/surgery/robot_healing/can_start(mob/user, mob/living/carbon/target, obj/item/tool) // hey delta? why is the check for this all the way down here
|
||||
for(var/obj/item/bodypart/B in target.bodyparts)
|
||||
if(B.is_robotic_limb())
|
||||
possible = TRUE
|
||||
break
|
||||
if(!possible)
|
||||
return FALSE
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/datum/surgery_step/robot_heal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
|
||||
var/woundtype
|
||||
if(implement_type == TOOL_WELDER)
|
||||
if(implement_type == TOOL_WELDER)
|
||||
healsbrute = TRUE
|
||||
healsburn = FALSE
|
||||
woundtype = "dents"
|
||||
@@ -133,3 +148,13 @@
|
||||
brutehealing = 10
|
||||
burnhealing = 10
|
||||
missinghpbonus = 15
|
||||
|
||||
/datum/surgery_step/robot_heal/upgraded
|
||||
brutehealing = 10
|
||||
burnhealing = 10
|
||||
missinghpbonus = 10
|
||||
|
||||
/datum/surgery_step/robot_heal/upgraded/femto
|
||||
brutehealing = 10
|
||||
burnhealing = 10
|
||||
missinghpbonus = 5
|
||||
|
||||
@@ -52,6 +52,40 @@
|
||||
|
||||
<h2 class="date">12 March 2021</h2>
|
||||
<h3 class="author">R3dtail updated:</h3>
|
||||
<h2 class="date">13 March 2021</h2>
|
||||
<h3 class="author">Hatterhat updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="spellcheck">BRPEDs don't examine as "not just a BRPED painted orange".</li>
|
||||
</ul>
|
||||
<h3 class="author">silicons updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="balance">paper wizard is now sentience_boss.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">12 March 2021</h2>
|
||||
<h3 class="author">R3dtail updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="spellcheck">Adds Periods and moves some words around.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">11 March 2021</h2>
|
||||
<h3 class="author">Putnam3145 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Supernova event</li>
|
||||
<li class="refactor">Bloodsucker day/night cycle now processes on a subsystem instead of using while and sleep (!!)</li>
|
||||
<li class="rscadd">A chaos-weighting system for secret</li>
|
||||
</ul>
|
||||
<h3 class="author">Sneakyrat updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixes precise insertion ui(when it asks you how many sheets you want to put in the mat container) so you can actually choose how much to put in and it will still work if your stack is bigger than the remaining space</li>
|
||||
<li class="bugfix">Fixes precise insertion not working for remote mat containers</li>
|
||||
<li class="bugfix">Fixes Protolathe/mechfab insert material animations not working</li>
|
||||
<li class="bugfix">Fixes the material insertion animation for protolathes occurring on the circuit printer</li>
|
||||
<li class="bugfix">Fixes the material insertion animation not actually playing when it was started</li>
|
||||
<li class="bugfix">Fixes the material insertion animation for iron not being made</li>
|
||||
<li class="bugfix">Fixes the material insertion animation sometimes not picking the right material for sheets that have multiple different materials in them</li>
|
||||
</ul>
|
||||
<h3 class="author">necromanceranne updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="spellcheck">Adds Periods and moves some words around.</li>
|
||||
</ul>
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "Hatterhat"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Robotic limb repair surgery now has tiers."
|
||||
@@ -0,0 +1,5 @@
|
||||
author: "Hatterhat"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Pubby and Delta now have roundstart limb-growers relatively close to, if not in, the operating theaters.
|
||||
tweak: Box QM's console now can announce things."
|
||||
@@ -0,0 +1,5 @@
|
||||
author: "Adelphon"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "messy2"
|
||||
- bugfix: "papermask"
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "Putnam3145"
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: "chaos loads now"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 160 KiB |
Reference in New Issue
Block a user