diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index b6ff6409982..c9e09ebeda4 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -368,7 +368,7 @@ mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" - mymob.blind.name = " " + mymob.blind.name = "blind" mymob.blind.screen_loc = "1,1" mymob.blind.mouse_opacity = 0 mymob.blind.layer = 0 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 4d0f5a5233e..23d76f7094e 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -342,3 +342,9 @@ icon_state = "mucus" random_icon_states = list("mucus") var/list/datum/disease2/disease/virus2 = list() + var/dry=0 // Keeps the lag down + +/obj/effect/decal/cleanable/mucus/New() + spawn(DRYING_TIME * 2) + dry=1 + diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8f0e5bf7fdd..5eec814ddfe 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1343,9 +1343,7 @@ mob/living/carbon/human/yank_out_object() if(species.name=="Slime People") dna.mutantrace = "slime" - if(mutations.len==0) - mutations=species.default_mutations - + mutations+=species.default_mutations spawn(0) update_icons() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 97959bfeb3d..b67aed5cfef 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -267,9 +267,6 @@ proc/get_damage_icon_part(damage_state, body_part) else temp = part.get_icon() - if(part.status & ORGAN_ROBOT) - temp.GrayScale() - if(part.status & ORGAN_DEAD) temp.ColorTone(necrosis_color_mod) temp.SetIntensity(0.7) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index e43d3d3f4bb..ea7512a7210 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -174,6 +174,7 @@ attack_verb = "punch" path = /mob/living/carbon/human/grey darksight = 5 // BOOSTED from 2 + eyes = "grey_eyes_s" max_hurt_damage = 3 // From 5 (for humans) default_mutations=list(mRemotetalk) // TK is also another candidate, but TK is overpowered as fuck. diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index cce7953c544..73b31817eea 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -625,6 +625,8 @@ /datum/organ/external/get_icon(gender="",isFat=0) //stand_icon = new /icon(icobase, "torso_[g][fat?"_fat":""]") + if (status & ORGAN_ROBOT) + return new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]") if(gender) gender="_[gender]" var/fat="" diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 1631a18f145..f4d517feeec 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -361,6 +361,14 @@ if (prob(30)) mob.jitteriness += 10 +/datum/disease2/effect/drunk + name = "Glasgow Syndrome" + stage = 2 + activate(var/mob/living/carbon/mob,var/multiplier) + mob << "You feel like you had one hell of a party!" + if (mob.reagents.get_reagent_amount("ethanol") < 325) + mob.reagents.add_reagent("ethanol", 5*multiplier) + ////////////////////////STAGE 1///////////////////////////////// /datum/disease2/effect/sneeze @@ -369,8 +377,13 @@ activate(var/mob/living/carbon/mob,var/multiplier) mob.say("*sneeze") if (prob(50)) - var/obj/effect/decal/cleanable/mucus/M = new(get_turf(mob)) - M.virus2 = virus_copylist(mob.virus2) + var/obj/effect/decal/cleanable/mucus/M= locate(/obj/effect/decal/cleanable/mucus) in get_turf(mob) + if(M==null) + M = new(get_turf(mob)) + else + if(M.dry) + M.dry=0 + M.virus2 |= virus_copylist(mob.virus2) /datum/disease2/effect/gunck name = "Flemmingtons" diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 169f3c49f16..9dbbacaa17a 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_races/robotic.dmi b/icons/mob/human_races/robotic.dmi new file mode 100644 index 00000000000..46100b45545 Binary files /dev/null and b/icons/mob/human_races/robotic.dmi differ