diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 222881eba83..7e9ac10e1f3 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -367,7 +367,7 @@ obj/item/weapon/card/id/ert/New() name = "\improper Tau Ceti Foreign Legion ID" icon_state = "centcom" assignment = "Tau Ceti Foreign Legion Volunteer" - access = list(access_legion, access_maint_tunnels, access_external_airlocks, access_security, access_engine, access_medical, access_research, access_atmospherics, access_medical_equip) + access = list(access_legion, access_maint_tunnels, access_external_airlocks, access_security, access_engine, access_engine_equip, access_medical, access_research, access_atmospherics, access_medical_equip) /obj/item/weapon/card/id/all_access name = "\improper Administrator's spare ID" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 04d5ddea405..131c02f4891 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -320,11 +320,11 @@ new /obj/item/weapon/reagent_containers/pill/escitalopram( src ) new /obj/item/weapon/reagent_containers/pill/escitalopram( src ) -/obj/item/weapon/storage/pill_bottle/rtm - name = "bottle of RTM pills" +/obj/item/weapon/storage/pill_bottle/rmt + name = "bottle of RMT pills" desc = "Contains pills used to remedy the effects of prolonged zero-gravity adaptations." -/obj/item/weapon/storage/pill_bottle/rtm/fill() +/obj/item/weapon/storage/pill_bottle/rmt/fill() ..() new /obj/item/weapon/reagent_containers/pill/rmt(src) new /obj/item/weapon/reagent_containers/pill/rmt(src) diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 60e84288f6a..d9c4c56e850 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -150,16 +150,6 @@ STOCK_ITEM_COMMON(smallcell, 4) ) new type(L) -STOCK_ITEM_COMMON(robolimb, 2.5) - var/manufacturer = pick(all_robolimbs) - var/limbtype = pick( \ - /obj/item/robot_parts/l_arm, \ - /obj/item/robot_parts/r_arm, \ - /obj/item/robot_parts/l_leg, \ - /obj/item/robot_parts/r_leg \ - ) - new limbtype(L, manufacturer) - //Spawns a random circuitboard //Allboards being a global list might be faster, but it didnt seem worth the extra memory STOCK_ITEM_COMMON(circuitboard, 2) diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index c6342904f67..cb6b4adc4e7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -1,5 +1,4 @@ // Mask /datum/gear/mask display_name = "sterile mask" - path = /obj/item/clothing/mask/surgical - cost = 2 + path = /obj/item/clothing/mask/surgical \ No newline at end of file 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 aad1724703e..477da7a8bd9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/human.dm @@ -95,8 +95,8 @@ ..() gear_tweaks = list(gear_tweak_free_color_choice) -/datum/gear/offworlder_pills - display_name = "bottle of RTM pills" - path = /obj/item/weapon/storage/pill_bottle/rtm +/datum/gear/offworlder_rig + display_name = "exo-stellar skeleton" + path = /obj/item/weapon/rig/light/offworlder whitelisted = list("Off-Worlder Human") sort_category = "Xenowear - Human" \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index d3c140b32c5..fa34c3db682 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -741,7 +741,10 @@ var/chance if(!is_emp) - chance = 2*max(0, damage - (chest? chest.breach_threshold : 0)) + var/damage_resistance = 0 + if(istype(chest, /obj/item/clothing/suit/space)) + damage_resistance = chest.breach_threshold + chance = 2*max(0, damage - damage_resistance) else //Want this to be roughly independant of the number of modules, meaning that X emp hits will disable Y% of the suit's modules on average. //that way people designing hardsuits don't have to worry (as much) about how adding that extra module will affect emp resiliance by 'soaking' hits for other modules diff --git a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm index 0c62cf5a11d..d563ad32d99 100644 --- a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm @@ -15,15 +15,10 @@ hazard_low_pressure = 10 /datum/species/human/offworlder/equip_later_gear(var/mob/living/carbon/human/H) - if(H.back) - var/obj/item/I = H.back - H.unEquip(I) - H.put_in_hands(I) - - var/obj/item/weapon/rig/light/offworlder/skeleton = new(get_turf(H)) - skeleton.autodrobe_no_remove = TRUE - H.equip_to_slot_or_del(skeleton,slot_back) - to_chat(H, "You have access to \the [skeleton], deploy it to allow you to walk properly.") + if(istype(H.get_equipped_item(slot_back), /obj/item/weapon/storage/backpack)) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/pill_bottle/rmt(H.back), slot_in_backpack) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/pill_bottle/rmt(H), slot_r_hand) /datum/species/human/offworlder/get_species_tally(var/mob/living/carbon/human/H) 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 f9d8dbcc44e..00ecc2693cf 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -386,16 +386,11 @@ return 1 return 0 -/datum/species/diona/before_equip(var/mob/living/carbon/human/H) - . = ..() - var/obj/item/device/flashlight/flare/F = new /obj/item/device/flashlight/flare(H) - if(H.backbag == 1) - H.equip_to_slot_or_del(F, slot_r_hand) +/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)) else - H.equip_to_slot_or_del(F, slot_in_backpack) - if(!QDELETED(F)) - F.autodrobe_no_remove = 1 - H.gender = NEUTER + 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 @@ -763,10 +758,6 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) /datum/species/bug/before_equip(var/mob/living/carbon/human/H) . = ..() H.gender = NEUTER - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vaurca(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vaurca(H.back), slot_in_backpack) var/obj/item/clothing/shoes/sandal/S = new /obj/item/clothing/shoes/sandal(H) if(H.equip_to_slot_or_del(S,slot_shoes)) S.autodrobe_no_remove = 1 @@ -774,6 +765,13 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) if(H.equip_to_slot_or_del(M, slot_wear_mask)) M.autodrobe_no_remove = 1 +/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)) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vaurca((H), slot_r_hand)) + + /datum/species/bug/handle_post_spawn(var/mob/living/carbon/human/H) H.gender = NEUTER return ..() diff --git a/html/changelogs/alberyk-morefix.yml b/html/changelogs/alberyk-morefix.yml new file mode 100644 index 00000000000..70bc84c73fa --- /dev/null +++ b/html/changelogs/alberyk-morefix.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Vaurca should spawn with their inhalers again." + - tweak: "Off-worlders do not spawn witheir rigs anymore, they can now be selected using the loadout instead." diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi index 3e01d0de409..cd675dce18e 100644 Binary files a/icons/mob/species/machine/suit.dmi and b/icons/mob/species/machine/suit.dmi differ