shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I did it

Browse Source
This commit is contained in:
Thalpy
2019-10-12 20:06:46 +01:00
parent f6796b93b3
commit 3b8ea30d9b
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/medicine.dm
+1
View File
@@ -103,6 +103,7 @@
St.purity = 1 St.purity = 1
N.volume -= 0.002 N.volume -= 0.002
St.data["grown_volume"] = St.data["grown_volume"] + added_volume St.data["grown_volume"] = St.data["grown_volume"] + added_volume
St.name = "[initial(St.name)] [round(St.data["grown_volume"], 0.1)]u colony"
/datum/chemical_reaction/styptic_powder /datum/chemical_reaction/styptic_powder
name = "Styptic Powder" name = "Styptic Powder"
code/modules/surgery/graft_synthtissue.dm
+2 -2
View File
@@ -61,8 +61,8 @@
target.reagents.remove_reagent("synthtissue", 10) target.reagents.remove_reagent("synthtissue", 10)
/datum/surgery_step/graft_synthtissue/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) /datum/surgery_step/graft_synthtissue/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] successfully grafts synthtissue to [chosen_organ].", "<span class='notice'>You succeed in grafting 10u to [chosen_organ].</span>") user.visible_message("[user] successfully grafts synthtissue to [chosen_organ].", "<span class='notice'>You succeed in grafting 10u of the synthflesh to the [chosen_organ].</span>")
chosen_organ.applyOrganDamage(health_restored) chosen_organ.applyOrganDamage(-health_restored)
return TRUE return TRUE
/datum/surgery_step/graft_synthtissue/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) /datum/surgery_step/graft_synthtissue/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+6 -1
View File
@@ -104,6 +104,7 @@
data = list("grown_volume" = 0, "injected_vol" = 0) data = list("grown_volume" = 0, "injected_vol" = 0)
/datum/reagent/synthtissue/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) /datum/reagent/synthtissue/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
message_admins("mob: data: [data["injected_vol"]] passed: [reac_volume]")
if(iscarbon(M)) if(iscarbon(M))
var/target = M.zone_selected var/target = M.zone_selected
if (M.stat == DEAD) if (M.stat == DEAD)
@@ -115,7 +116,7 @@
to_chat(M, "<span class='danger'>You feel your [target] heal! It stings like hell!</span>") to_chat(M, "<span class='danger'>You feel your [target] heal! It stings like hell!</span>")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
if(method==INJECT) if(method==INJECT)
data["injected_vol"] = data["injected_vol"] + reac_volume data["injected_vol"] = reac_volume
..() ..()
/datum/reagent/synthtissue/on_mob_life(mob/living/carbon/C) /datum/reagent/synthtissue/on_mob_life(mob/living/carbon/C)
@@ -136,6 +137,10 @@
return ..() return ..()
if(passed_data["grown_volume"] > data["grown_volume"]) if(passed_data["grown_volume"] > data["grown_volume"])
data["grown_volume"] = passed_data["grown_volume"] data["grown_volume"] = passed_data["grown_volume"]
message_admins("merge: data: [data["injected_vol"]] passed: [passed_data["injected_vol"]]")
if(iscarbon(holder.my_atom))
data["injected_vol"] = data["injected_vol"] + passed_data["injected_vol"]
passed_data["injected_vol"] = 0
..() ..()
/datum/reagent/synthtissue/on_new(passed_data) /datum/reagent/synthtissue/on_new(passed_data)