diff --git a/code/defines/mob/living/carbon/alien_humanoid.dm b/code/defines/mob/living/carbon/alien_humanoid.dm index 87722cdbeac..ffbfc7aa49c 100644 --- a/code/defines/mob/living/carbon/alien_humanoid.dm +++ b/code/defines/mob/living/carbon/alien_humanoid.dm @@ -10,6 +10,7 @@ var/icon/stand_icon = null var/icon/lying_icon = null var/icon/resting_icon = null + var/icon/running_icon = null var/last_b_state = 1.0 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 6c186a9b227..374783174bb 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -361,7 +361,11 @@ ZIPPO src.update_icon() return - +/obj/item/weapon/cigpacket/dromedaryco + name = "DromedaryCo packet" + desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" + icon_state = "Dpacket" + item_state = "Dpacket" ///////// //ZIPPO// diff --git a/code/modules/clothing/mask.dm b/code/modules/clothing/mask.dm index deed7760c99..1a8fc6d83b4 100644 --- a/code/modules/clothing/mask.dm +++ b/code/modules/clothing/mask.dm @@ -39,6 +39,14 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 +/obj/item/clothing/mask/balaclava + name = "balaclava" + desc = "LOADSAMONEY" + icon_state = "balaclava" + item_state = "balaclava" + flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH|BLOCKHAIR + w_class = 2 + /obj/item/clothing/mask/muzzle name = "muzzle" desc = "To stop that awful noise." diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index 446f0686321..64274d21912 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -11,6 +11,7 @@ src.stand_icon = new /icon('alien.dmi', "aliend_s") src.lying_icon = new /icon('alien.dmi', "aliend_l") src.resting_icon = new /icon('alien.dmi', "aliend_sleep") + src.running_icon = new /icon('alien.dmi', "aliend_running") src.icon = src.stand_icon update_clothing() src << "\blue Your icons have been generated!" diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 7c7e5eaedf6..99b1d054a87 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -10,6 +10,7 @@ src.stand_icon = new /icon('alien.dmi', "alienh_s") src.lying_icon = new /icon('alien.dmi', "alienh_l") src.resting_icon = new /icon('alien.dmi', "alienh_sleep") + src.running_icon = new /icon('alien.dmi', "alienh_running") src.icon = src.stand_icon update_clothing() src << "\blue Your icons have been generated!" diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index ecc3b459e68..3c824954f4f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -10,6 +10,7 @@ src.stand_icon = new /icon('alien.dmi', "aliens_s") src.lying_icon = new /icon('alien.dmi', "aliens_l") src.resting_icon = new /icon('alien.dmi', "aliens_sleep") + src.running_icon = new /icon('alien.dmi', "aliens_running") src.icon = src.stand_icon update_clothing() src << "\blue Your icons have been generated!" diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 52fd1b1ac25..8dff96afd79 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -11,6 +11,7 @@ stand_icon = new /icon('alien.dmi', "alien_s") lying_icon = new /icon('alien.dmi', "alien_l") resting_icon = new /icon('alien.dmi', "alienh_sleep") + running_icon = new /icon('alien.dmi', "alienh_running") icon = stand_icon update_clothing() src << "\blue Your icons have been generated!" @@ -336,6 +337,13 @@ else icon = resting_icon + else if(!lying) + if(update_icon) + if(m_intent == "run") + icon = running_icon + else + icon = stand_icon + overlays += body_lying if (face_lying) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 0fe1620a7a1..278220933eb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -12,6 +12,8 @@ src.verbs -= /mob/living/carbon/alien/humanoid/verb/ventcrawl src.stand_icon = new /icon('alien.dmi', "queen_s") src.lying_icon = new /icon('alien.dmi', "queen_l") + src.resting_icon = new /icon('alien.dmi', "queen_sleep") + src.running_icon = new /icon('alien.dmi', "queen_running") src.icon = src.stand_icon update_clothing() src << "\blue Your icons have been generated!" diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi index 1efa862fdc3..261e1ed1253 100644 Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index b24f0faef86..0acd19df4ff 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 2f3b58b99af..1485cd386d3 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index a142b57ea99..3808addbeec 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ