diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 96501d9a9fa..e9a72089581 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -80,7 +80,7 @@
src.icon_state = "mw"
src.broken = 0 // Fix it!
src.dirty = 0 // just to be sure
- src.flags = OPENCONTAINER
+ src.flags = OPENCONTAINER | NOREACT
else
to_chat(user, "It's broken!")
return 1
@@ -98,7 +98,7 @@
src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
src.icon_state = "mw"
- src.flags = OPENCONTAINER
+ src.flags = OPENCONTAINER | NOREACT
else //Otherwise bad luck!!
to_chat(user, "It's dirty!")
return 1
diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm
index f39bd01b19d..8c0a2ef0b8f 100644
--- a/code/game/objects/items/weapons/vaurca_items.dm
+++ b/code/game/objects/items/weapons/vaurca_items.dm
@@ -25,11 +25,14 @@
icon_state = "skrell_mask"
item_state = "skrell_mask"
-/obj/item/clothing/mask/breath/vaurca/shaper
+/obj/item/clothing/head/shaper
name = "shaper helmet"
- desc = "Commonly worn by Preimmients, these robes are meant to catch pheromones, obfuscating hive affiliation."
+ desc = "A mirrored helm commonly worn by Preimmients. The helm masks the visage of its wearer, symbolically and literally blinding them to all but the path set in front of them."
+ icon = 'icons/obj/vaurca_items.dmi'
icon_state = "shaper_helmet"
item_state = "shaper_helmet"
+ contained_sprite = TRUE
+ species_restricted = list("Vaurca")
/obj/item/weapon/melee/energy/vaurca
name = "thermal knife"
diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm
index 477da7a8bd9..9b3eeff06fb 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm
@@ -44,10 +44,6 @@
display_name = "neckbrace"
path = /obj/item/clothing/accessory/offworlder/bracer/neckbrace
-/datum/gear/accessory/offworlder/scarf
- display_name = "pioneer scarf"
- path = /obj/item/clothing/accessory/scarf/offworlder
-
/datum/gear/accessory/offworlder_armband
display_name = "exo-stellar ribbon selection"
path = /obj/item/clothing/accessory/armband/offworlder
@@ -76,14 +72,13 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
-/datum/gear/mask/offworlder/veil
+/datum/gear/mask/offworlder/overmask/veil
display_name = "starveil"
path = /obj/item/clothing/mask/offworlder/veil
-/datum/gear/mask/offworlder/veil/New()
- ..()
- gear_tweaks = list(gear_tweak_free_color_choice)
-
+/datum/gear/mask/offworlder/overmask/scarf
+ display_name = "pioneer scarf"
+ path = /obj/item/clothing/mask/offworlder
/datum/gear/gloves/offworlder
display_name = "starmitts"
diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
index 56758d9272e..f5f62f0c85a 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
@@ -27,9 +27,15 @@
display_name = "skrell expression mask"
path = /obj/item/clothing/mask/breath/vaurca/expression/skrell
-/datum/gear/mask/vaurca_expression/shaper
+/datum/gear/head/shaper
display_name = "shaper helmet"
- path = /obj/item/clothing/mask/breath/vaurca/shaper
+ path = /obj/item/clothing/head/shaper
+ whitelisted = list("Vaurca Worker", "Vaurca Warrior")
+ sort_category = "Xenowear - Vaurca"
+
+/datum/gear/head/shaper/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/cape
display_name = "tunnel cloak"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 179e6fc59a0..1a6b37f0075 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -157,12 +157,18 @@
eye.owner.eyeobj = null
eye.owner = null
+/obj/item/clothing/mask/offworlder
+ name = "pioneer's scarf"
+ desc = "Usually a treasured item, these spider-silk scarves are seen passed down by generations of expeditionaries."
+ icon_state = "pioneer_scarf"
+ item_state = "pioneer_scarf"
+ w_class = 2
+ body_parts_covered = FACE
+
/obj/item/clothing/mask/offworlder/veil
name = "starveil"
desc = "A thin holographic veil meant to cover the face, intended to block out light."
icon_state = "starveil"
item_state = "starveil"
- w_class = 2
- body_parts_covered = FACE
down_body_parts_covered = null
adjustable = TRUE
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index f02ab89af6a..23cf15cf177 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -170,6 +170,7 @@
/obj/item/clothing/head/lightrig/offworlder
name = "helmet"
species_restricted = list("Human")
+ flash_protection = FLASH_PROTECTION_MAJOR
/obj/item/clothing/suit/lightrig/offworlder
body_parts_covered = UPPER_TORSO
@@ -177,7 +178,6 @@
cold_protection = UPPER_TORSO
flags_inv = 0
species_restricted = list("Human")
- flash_protection = FLASH_PROTECTION_MAJOR
/obj/item/weapon/rig/light/offworlder/techno
name = "techno-conglomerate mobility hardsuit control module"
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index d1944d187ac..1047279365c 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -170,7 +170,7 @@
/obj/item/clothing/suit/vaurca/shaper
name = "shaper robes"
- desc = "A fashionable robe tailored for nonhuman proportions, this one is blue and golden."
+ desc = "Commonly worn by Preimmients, these robes are meant to catch pheromones, obfuscating hive affiliation."
icon_state = "shaper_robes"
item_state = "shaper_robes"
species_restricted = list("Vaurca")
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 2de5aac42a1..36624aed439 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -313,12 +313,6 @@
icon_state = "zebrascarf"
item_state = "zebrascarf"
-/obj/item/clothing/accessory/scarf/offworlder
- name = "pioneer's scarf"
- desc = "Usually a treasured item, these spider-silk scarves are seen passed down by generations of expeditionaries."
- icon_state = "pioneer_scarf"
- item_state = "pioneer_scarf"
-
/obj/item/clothing/accessory/chaps
name = "brown chaps"
desc = "A pair of loose, brown leather chaps."
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index cedd2dcf75c..aeec462212a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1607,8 +1607,8 @@
var/bac = get_blood_alcohol()
var/SR = species.ethanol_resistance
-
- if(bac > INTOX_REACTION*SR)
- return TRUE
+ if(SR>0)
+ if(bac > INTOX_REACTION*SR)
+ return TRUE
return FALSE
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/intoxication.dm b/code/modules/mob/living/carbon/human/intoxication.dm
index 4e2ea28fa1f..289e0b1cd6e 100644
--- a/code/modules/mob/living/carbon/human/intoxication.dm
+++ b/code/modules/mob/living/carbon/human/intoxication.dm
@@ -1,5 +1,3 @@
-var/mob/living/carbon/human/alcohol_clumsy = 0
-
//This proc handles the effects of being intoxicated. Removal of intoxication is done elswhere: By the liver, in organ_internal.dm
/mob/living/carbon/human/proc/handle_intoxication()
@@ -44,11 +42,6 @@ var/mob/living/carbon/human/alcohol_clumsy = 0
to_chat(src,"You feel uncoordinated and unsteady on your feet!")
confused = max(confused, 10)
slurring = max(slurring, 50)
- if (!alcohol_clumsy)
- alcohol_clumsy = 1
- else if (alcohol_clumsy)
- to_chat(src,"You feel more sober and steady.")
- alcohol_clumsy = 0
if(bac > INTOX_VOMIT*SR)
slurring = max(slurring, 75)
@@ -139,5 +132,4 @@ var/mob/living/carbon/human/alcohol_clumsy = 0
if(H.get_blood_alcohol() >= INTOX_MUSCLEIMP*H.species.ethanol_resistance)
return 1
- return 0
-
+ return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index adf46187d61..03888131267 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -391,9 +391,9 @@
/datum/species/diona/equip_later_gear(var/mob/living/carbon/human/H)
if(istype(H.get_equipped_item(slot_back), /obj/item/weapon/storage/backpack))
- H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare((H.back), slot_in_backpack))
+ H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare(H.back), slot_in_backpack)
else
- H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare((H), slot_r_hand))
+ H.equip_to_slot_or_del(new /obj/item/device/flashlight/flare(H), slot_r_hand)
/datum/species/diona/handle_post_spawn(var/mob/living/carbon/human/H)
H.gender = NEUTER
@@ -770,10 +770,9 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
/datum/species/bug/equip_later_gear(var/mob/living/carbon/human/H)
if(istype(H.get_equipped_item(slot_back), /obj/item/weapon/storage/backpack))
- H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vaurca((H.back), slot_in_backpack))
+ H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/inhaler/phoron_special(H.back), slot_in_backpack)
else
- H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vaurca((H), slot_r_hand))
-
+ H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/inhaler/phoron_special(H), slot_r_hand)
/datum/species/bug/handle_post_spawn(var/mob/living/carbon/human/H)
H.gender = NEUTER
diff --git a/html/changelogs/alberyk-morebugfixes.yml b/html/changelogs/alberyk-morebugfixes.yml
new file mode 100644
index 00000000000..9b58955c66f
--- /dev/null
+++ b/html/changelogs/alberyk-morebugfixes.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+ - bugfix: "Vaurca and diona should now get their survivals items."
+ - bugfix: "The ESS helmet should now offer welding protection."
diff --git a/icons/mob/human_races/r_vaurca.dmi b/icons/mob/human_races/r_vaurca.dmi
index 7535d021b84..e66af4a60a0 100644
Binary files a/icons/mob/human_races/r_vaurca.dmi and b/icons/mob/human_races/r_vaurca.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index efd278b569c..b2745dfeee6 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi
index fb835d81348..bc45cfa0e9b 100644
Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index 1dd00fb5619..9d391853152 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 5303ae46808..e2882b9c6be 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index c9dc54672ea..cbe20b44e36 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi
index f2ff957b53f..1e3690e7360 100644
Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ