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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

Browse Source
This commit is contained in:
Linzolle
2019-11-25 21:01:25 -06:00
parent f9b632019b 56bdb36058
commit cc54e5230f
654 changed files with 4610 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/bodyparts.dm
+7 -7
View File
@@ -70,11 +70,11 @@
var/heavy_burn_msg = "peeling away"
/obj/item/bodypart/examine(mob/user)
..()
. = ..()
if(brute_dam > DAMAGE_PRECISION)
to_chat(user, "<span class='warning'>This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.</span>")
. += "<span class='warning'>This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.</span>"
if(burn_dam > DAMAGE_PRECISION)
to_chat(user, "<span class='warning'>This limb has [burn_dam > 30 ? "severe" : "minor"] burns.</span>")
. += "<span class='warning'>This limb has [burn_dam > 30 ? "severe" : "minor"] burns.</span>"
/obj/item/bodypart/blob_act()
take_damage(max_damage)
@@ -354,7 +354,7 @@
if("legs" in S.default_features)
if(body_zone == BODY_ZONE_L_LEG || body_zone == BODY_ZONE_R_LEG)
if(DIGITIGRADE in S.species_traits)
digitigrade_type = lowertext(H.dna.features.["legs"])
digitigrade_type = lowertext(H.dna.features["legs"])
else
digitigrade_type = null
@@ -363,9 +363,9 @@
Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
if(Smark)
body_markings_icon = Smark.icon
if(H.dna.features.["mam_body_markings"] != "None")
body_markings = lowertext(H.dna.features.["mam_body_markings"])
aux_marking = lowertext(H.dna.features.["mam_body_markings"])
if(H.dna.features["mam_body_markings"] != "None")
body_markings = lowertext(H.dna.features["mam_body_markings"])
aux_marking = lowertext(H.dna.features["mam_body_markings"])
else
body_markings = "plain"
aux_marking = "plain"
code/modules/surgery/experimental_dissection.dm
+1 -1
View File
@@ -110,4 +110,4 @@
requires_tech = TRUE
replaced_by = null
#undef EXPDIS_FAIL_MSG
#undef BASE_HUMAN_REWARD
code/modules/surgery/organs/augments_arms.dm
+2 -2
View File
@@ -38,8 +38,8 @@
transform = matrix(-1, 0, 0, 0, 1, 0)
/obj/item/organ/cyberimp/arm/examine(mob/user)
..()
to_chat(user, "<span class='info'>[src] is assembled in the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>")
. = ..()
. += "<span class='info'>[src] is assembled in the [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>"
/obj/item/organ/cyberimp/arm/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
code/modules/surgery/organs/heart.dm
-1
View File
@@ -212,7 +212,6 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
ramount += regen_amount
/obj/item/organ/heart/cybernetic/upgraded/proc/used_dose()
. = ..()
addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
ramount = 0
code/modules/surgery/organs/organ_internal.dm
-3
View File
@@ -1,6 +1,3 @@
#define STANDARD_ORGAN_THRESHOLD 100
#define STANDARD_ORGAN_HEALING 0.001
/obj/item/organ
name = "organ"
icon = 'icons/obj/surgery.dmi'
code/modules/surgery/tools.dm
+3 -3
View File
@@ -30,7 +30,7 @@
/obj/item/retractor/advanced/examine(mob/living/user)
. = ..()
to_chat(user, "<span class = 'notice> It resembles a [tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"]. </span>")
. += "<span class = 'notice> It resembles a [tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"]. </span>"
/obj/item/retractor/augment
name = "retractor"
@@ -133,7 +133,7 @@
/obj/item/surgicaldrill/advanced/examine(mob/living/user)
. = ..()
to_chat(user, "<span class = 'notice> It's set to [tool_behaviour == TOOL_DRILL ? "drilling" : "mending"] mode.</span>")
. += "<span class = 'notice> It's set to [tool_behaviour == TOOL_DRILL ? "drilling" : "mending"] mode.</span>"
/obj/item/surgicaldrill/augment
name = "surgical drill"
@@ -206,7 +206,7 @@
/obj/item/scalpel/advanced/examine(mob/living/user)
. = ..()
to_chat(user, "<span class = 'notice> It's set to [tool_behaviour == TOOL_SCALPEL ? "scalpel" : "saw"] mode. </span>")
. += "<span class = 'notice> It's set to [tool_behaviour == TOOL_SCALPEL ? "scalpel" : "saw"] mode. </span>"
/obj/item/scalpel/augment
name = "scalpel"