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

should be ready.

Browse Source
This commit is contained in:
Ghommie
2019-06-06 19:24:20 +02:00
parent 44358e054a
commit d3d2b8d898
168 changed files with 444 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/advanced/brainwashing.dm
+1 -1
View File
@@ -41,7 +41,7 @@
if(!target.mind)
user.visible_message("[target] doesn't respond to the brainwashing, as if [target.p_they()] lacked a mind...")
return FALSE
if(target.has_trait(TRAIT_MINDSHIELD))
if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
user.visible_message("You hear a faint buzzing from a device inside [target]'s brain, and the brainwashing is erased.")
return FALSE
user.visible_message("[user] successfully brainwashes [target]!", "<span class='notice'>You succeed in brainwashing [target].</span>")
code/modules/surgery/advanced/revival.dm
+1 -1
View File
@@ -18,7 +18,7 @@
return FALSE
if(target.stat != DEAD)
return FALSE
if(target.suiciding || target.has_trait(TRAIT_NOCLONE) || target.hellbound)
if(target.suiciding || HAS_TRAIT(target, TRAIT_NOCLONE) || target.hellbound)
return FALSE
var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
if(!B)
code/modules/surgery/bodyparts/bodyparts.dm
+3 -3
View File
@@ -88,7 +88,7 @@
/obj/item/bodypart/attack(mob/living/carbon/C, mob/user)
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(C.has_trait(TRAIT_LIMBATTACHMENT))
if(HAS_TRAIT(C, TRAIT_LIMBATTACHMENT))
if(!H.get_bodypart(body_zone) && !animal_origin)
if(H == user)
H.visible_message("<span class='warning'>[H] jams [src] into [H.p_their()] empty socket!</span>",\
@@ -221,7 +221,7 @@
//Checks disabled status thresholds
/obj/item/bodypart/proc/check_disabled()
if(!can_dismember() || owner.has_trait(TRAIT_NODISMEMBER))
if(!can_dismember() || HAS_TRAIT(owner, TRAIT_NODISMEMBER))
return
if(!disabled && (get_damage(TRUE) >= max_damage))
set_disabled(TRUE)
@@ -284,7 +284,7 @@
C = owner
no_update = FALSE
if(C.has_trait(TRAIT_HUSK) && is_organic_limb())
if(HAS_TRAIT(C, TRAIT_HUSK) && is_organic_limb())
species_id = "husk" //overrides species_id
dmg_overlay_type = "" //no damage overlay shown when husked
should_draw_gender = FALSE
code/modules/surgery/bodyparts/dismemberment.dm
+2 -2
View File
@@ -12,7 +12,7 @@
return FALSE
if(C.status_flags & GODMODE)
return FALSE
if(C.has_trait(TRAIT_NODISMEMBER))
if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
return FALSE
var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST)
@@ -47,7 +47,7 @@
var/mob/living/carbon/C = owner
if(!dismemberable)
return FALSE
if(C.has_trait(TRAIT_NODISMEMBER))
if(HAS_TRAIT(C, TRAIT_NODISMEMBER))
return FALSE
. = list()
var/organ_spilled = 0
code/modules/surgery/bodyparts/head.dm
+1 -1
View File
@@ -68,7 +68,7 @@
C = owner
real_name = C.real_name
if(C.has_trait(TRAIT_HUSK))
if(HAS_TRAIT(C, TRAIT_HUSK))
real_name = "Unknown"
hair_style = "Bald"
facial_hair_style = "Shaved"
code/modules/surgery/lipoplasty.dm
+1 -1
View File
@@ -4,7 +4,7 @@
possible_locs = list(BODY_ZONE_CHEST)
/datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
if(target.has_trait(TRAIT_FAT))
if(HAS_TRAIT(target, TRAIT_FAT))
return 1
return 0
code/modules/surgery/organs/ears.dm
+2 -2
View File
@@ -25,7 +25,7 @@
return
var/mob/living/carbon/C = owner
// genetic deafness prevents the body from using the ears, even if healthy
if(C.has_trait(TRAIT_DEAF))
if(HAS_TRAIT(C, TRAIT_DEAF))
deaf = max(deaf, 1)
else if(ear_damage < UNHEALING_EAR_DAMAGE) // if higher than UNHEALING_EAR_DAMAGE, no natural healing occurs.
ear_damage = max(ear_damage - 0.05, 0)
@@ -37,7 +37,7 @@
var/mob/living/carbon/C = owner
if(iscarbon(owner) && C.has_trait(TRAIT_DEAF))
if(iscarbon(owner) && HAS_TRAIT(C, TRAIT_DEAF))
deaf = 1
/obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)
code/modules/surgery/organs/eyes.dm
+1 -1
View File
@@ -26,7 +26,7 @@
HMN.regenerate_icons()
else
eye_color = HMN.eye_color
if(HMN.has_trait(TRAIT_NIGHT_VISION) && !lighting_alpha)
if(HAS_TRAIT(HMN, TRAIT_NIGHT_VISION) && !lighting_alpha)
lighting_alpha = LIGHTING_PLANE_ALPHA_NV_TRAIT
see_in_dark = 8
M.update_tint()
code/modules/surgery/organs/liver.dm
+1 -1
View File
@@ -25,7 +25,7 @@
//slowly heal liver damage
damage = max(0, damage - 0.1)
if(filterToxins && !owner.has_trait(TRAIT_TOXINLOVER))
if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
//handle liver toxin filtration
for(var/I in C.reagents.reagent_list)
var/datum/reagent/pickedreagent = I
code/modules/surgery/organs/lungs.dm
+4 -4
View File
@@ -58,7 +58,7 @@
/obj/item/organ/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
if((H.status_flags & GODMODE))
return
if(H.has_trait(TRAIT_NOBREATH))
if(HAS_TRAIT(H, TRAIT_NOBREATH))
return
if(!breath || (breath.total_moles() == 0))
@@ -66,7 +66,7 @@
return
if(H.health >= H.crit_threshold)
H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
else if(!H.has_trait(TRAIT_NOCRITDAMAGE))
else if(!HAS_TRAIT(H, TRAIT_NOCRITDAMAGE))
H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
H.failed_last_breath = TRUE
@@ -365,7 +365,7 @@
/obj/item/organ/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
var/breath_temperature = breath.temperature
if(!H.has_trait(TRAIT_RESISTCOLD)) // COLD DAMAGE
if(!HAS_TRAIT(H, TRAIT_RESISTCOLD)) // COLD DAMAGE
var/cold_modifier = H.dna.species.coldmod
if(breath_temperature < cold_level_3_threshold)
H.apply_damage_type(cold_level_3_damage*cold_modifier, cold_damage_type)
@@ -377,7 +377,7 @@
if(prob(20))
to_chat(H, "<span class='warning'>You feel [cold_message] in your [name]!</span>")
if(!H.has_trait(TRAIT_RESISTHEAT)) // HEAT DAMAGE
if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE
var/heat_modifier = H.dna.species.heatmod
if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
H.apply_damage_type(heat_level_1_damage*heat_modifier, heat_damage_type)
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -110,7 +110,7 @@
var/breathes = TRUE
var/blooded = TRUE
if(dna && dna.species)
if(has_trait(TRAIT_NOBREATH, SPECIES_TRAIT))
if(HAS_TRAIT_FROM(src, TRAIT_NOBREATH, SPECIES_TRAIT))
breathes = FALSE
if(NOBLOOD in dna.species.species_traits)
blooded = FALSE
code/modules/surgery/plastic_surgery.dm
+2 -2
View File
@@ -13,8 +13,8 @@
user.visible_message("[user] begins to alter [target]'s appearance.", "<span class='notice'>You begin to alter [target]'s appearance...</span>")
/datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.has_trait(TRAIT_DISFIGURED, TRAIT_GENERIC))
target.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
if(HAS_TRAIT_FROM(target, TRAIT_DISFIGURED, TRAIT_GENERIC))
REMOVE_TRAIT(target, TRAIT_DISFIGURED, TRAIT_GENERIC)
user.visible_message("[user] successfully restores [target]'s appearance!", "<span class='notice'>You successfully restore [target]'s appearance.</span>")
else
var/list/names = list()