diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index b783644b55b..7a30661eac1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -8,30 +8,31 @@ icon_broken = "securecebroken" icon_off = "secureceoff" - - fill() - if(prob(50)) - new /obj/item/weapon/storage/backpack/industrial(src) - else - new /obj/item/weapon/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(src) - new /obj/item/blueprints(src) - new /obj/item/clothing/under/rank/chief_engineer(src) - new /obj/item/clothing/head/hardhat/white(src) - new /obj/item/clothing/head/welding(src) - new /obj/item/clothing/gloves/yellow(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/weapon/cartridge/ce(src) - new /obj/item/device/radio/headset/heads/ce(src) - new /obj/item/weapon/storage/toolbox/mechanical(src) - new /obj/item/clothing/suit/storage/hazardvest(src) - new /obj/item/clothing/mask/gas(src) - new /obj/item/device/multitool(src) - new /obj/item/device/flash(src) - new /obj/item/taperoll/engineering(src) +/obj/structure/closet/secure_closet/engineering_chief/fill() + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) + if (prob(70)) + new /obj/item/clothing/accessory/storage/brown_vest(src) + else + new /obj/item/clothing/accessory/storage/webbing(src) + new /obj/item/blueprints(src) + new /obj/item/clothing/under/rank/chief_engineer(src) + new /obj/item/clothing/head/hardhat/white(src) + new /obj/item/clothing/head/welding(src) + new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/yellow/specialu(src) + new /obj/item/clothing/gloves/yellow/specialt(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/weapon/cartridge/ce(src) + new /obj/item/device/radio/headset/heads/ce(src) + new /obj/item/weapon/storage/toolbox/mechanical(src) + new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/device/multitool(src) + new /obj/item/device/flash(src) + new /obj/item/taperoll/engineering(src) /obj/structure/closet/secure_closet/engineering_chief2 name = "chief engineer's attire" @@ -43,16 +44,14 @@ icon_broken = "securecebroken" icon_off = "secureceoff" - - fill() - new /obj/item/weapon/storage/backpack/industrial(src) - new /obj/item/weapon/storage/backpack/satchel_eng(src) - new /obj/item/clothing/accessory/storage/brown_vest(src) - new /obj/item/clothing/accessory/storage/webbing(src) - new /obj/item/clothing/under/rank/chief_engineer(src) - new /obj/item/clothing/shoes/brown(src) - new /obj/item/device/radio/headset/heads/ce(src) - +/obj/structure/closet/secure_closet/engineering_chief2/fill() + new /obj/item/weapon/storage/backpack/industrial(src) + new /obj/item/weapon/storage/backpack/satchel_eng(src) + new /obj/item/clothing/accessory/storage/brown_vest(src) + new /obj/item/clothing/accessory/storage/webbing(src) + new /obj/item/clothing/under/rank/chief_engineer(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/device/radio/headset/heads/ce(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies" @@ -64,19 +63,20 @@ icon_broken = "secureengelecbroken" icon_off = "secureengelecoff" - - fill() - new /obj/item/clothing/gloves/yellow(src) - new /obj/item/clothing/gloves/yellow(src) - new /obj/item/weapon/storage/toolbox/electrical(src) - new /obj/item/weapon/storage/toolbox/electrical(src) - new /obj/item/weapon/storage/toolbox/electrical(src) - new /obj/item/weapon/module/power_control(src) - new /obj/item/weapon/module/power_control(src) - new /obj/item/weapon/module/power_control(src) - new /obj/item/device/multitool(src) - new /obj/item/device/multitool(src) - new /obj/item/device/multitool(src) +/obj/structure/closet/secure_closet/engineering_electrical/fill() + new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/yellow(src) + new /obj/item/clothing/gloves/yellow/specialu(src) + new /obj/item/clothing/gloves/yellow/specialt(src) + new /obj/item/weapon/storage/toolbox/electrical(src) + new /obj/item/weapon/storage/toolbox/electrical(src) + new /obj/item/weapon/storage/toolbox/electrical(src) + new /obj/item/weapon/module/power_control(src) + new /obj/item/weapon/module/power_control(src) + new /obj/item/weapon/module/power_control(src) + new /obj/item/device/multitool(src) + new /obj/item/device/multitool(src) + new /obj/item/device/multitool(src) /obj/structure/closet/secure_closet/engineering_welding name = "welding supplies" @@ -88,16 +88,16 @@ icon_broken = "secureengweldbroken" icon_off = "secureengweldoff" - fill() - new /obj/item/clothing/head/welding(src) - new /obj/item/clothing/head/welding(src) - new /obj/item/clothing/head/welding(src) - new /obj/item/weapon/weldingtool/largetank(src) - new /obj/item/weapon/weldingtool/largetank(src) - new /obj/item/weapon/weldingtool/largetank(src) - new /obj/item/weapon/weldpack(src) - new /obj/item/weapon/weldpack(src) - new /obj/item/weapon/weldpack(src) +/obj/structure/closet/secure_closet/engineering_welding/fill() + new /obj/item/clothing/head/welding(src) + new /obj/item/clothing/head/welding(src) + new /obj/item/clothing/head/welding(src) + new /obj/item/weapon/weldingtool/largetank(src) + new /obj/item/weapon/weldingtool/largetank(src) + new /obj/item/weapon/weldingtool/largetank(src) + new /obj/item/weapon/weldpack(src) + new /obj/item/weapon/weldpack(src) + new /obj/item/weapon/weldpack(src) /obj/structure/closet/secure_closet/engineering_personal name = "engineer's locker" @@ -109,22 +109,22 @@ icon_broken = "secureengbroken" icon_off = "secureengoff" - fill() - if(prob(50)) - new /obj/item/weapon/storage/backpack/industrial(src) - else - new /obj/item/weapon/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(src) - new /obj/item/weapon/storage/toolbox/mechanical(src) - new /obj/item/device/radio/headset/headset_eng(src) - new /obj/item/clothing/suit/storage/hazardvest(src) - new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson(src) - new /obj/item/weapon/cartridge/engineering(src) - new /obj/item/taperoll/engineering(src) +/obj/structure/closet/secure_closet/engineering_personal/fill() + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) + if (prob(70)) + new /obj/item/clothing/accessory/storage/brown_vest(src) + else + new /obj/item/clothing/accessory/storage/webbing(src) + new /obj/item/weapon/storage/toolbox/mechanical(src) + new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/glasses/meson(src) + new /obj/item/weapon/cartridge/engineering(src) + new /obj/item/taperoll/engineering(src) /obj/structure/closet/secure_closet/atmos_personal name = "technician's locker" @@ -136,22 +136,21 @@ icon_broken = "secureatmbroken" icon_off = "secureatmoff" - - fill() - if(prob(50)) - new /obj/item/weapon/storage/backpack/industrial(src) - else - new /obj/item/weapon/storage/backpack/satchel_eng(src) - if (prob(70)) - new /obj/item/clothing/accessory/storage/brown_vest(src) - else - new /obj/item/clothing/accessory/storage/webbing(src) - new /obj/item/clothing/suit/fire/atmos(src) - new /obj/item/clothing/head/hardhat/red/atmos(src) - new /obj/item/device/flashlight(src) - new /obj/item/weapon/extinguisher(src) - new /obj/item/device/radio/headset/headset_eng(src) - new /obj/item/clothing/suit/storage/hazardvest(src) - new /obj/item/clothing/mask/gas(src) - new /obj/item/weapon/cartridge/atmos(src) - new /obj/item/taperoll/engineering(src) +/obj/structure/closet/secure_closet/atmos_personal/fill() + if(prob(50)) + new /obj/item/weapon/storage/backpack/industrial(src) + else + new /obj/item/weapon/storage/backpack/satchel_eng(src) + if (prob(70)) + new /obj/item/clothing/accessory/storage/brown_vest(src) + else + new /obj/item/clothing/accessory/storage/webbing(src) + new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/head/hardhat/red/atmos(src) + new /obj/item/device/flashlight(src) + new /obj/item/weapon/extinguisher(src) + new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/weapon/cartridge/atmos(src) + new /obj/item/taperoll/engineering(src) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 05455a9a669..fad2c2eb842 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -361,6 +361,7 @@ return 0 // return 1 to cancel attack_hand() /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user) + ..() if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) if (clipped) user << "\The [src] have already been clipped!" @@ -371,6 +372,7 @@ user.visible_message("[user] cuts the fingertips off of \the [src].","You cut the fingertips off of \the [src].") clipped = 1 + siemens_coefficient += 0.25 name = "modified [name]" desc = "[desc]
They have had the fingertips cut off of them." if("exclude" in species_restricted) diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index cb433bb77dc..97cec70427f 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -63,26 +63,6 @@ update_icon() return - //clipping fingertips - if(!clipped) - playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("[user] cuts the fingertips off of the [src].","You cut the fingertips off of the [src].") - - clipped = 1 - name = "mangled [name]" - desc = "[desc]
They have had the fingertips cut off of them." - if("exclude" in species_restricted) - species_restricted -= "Unathi" - species_restricted -= "Tajara" - species_restricted -= "Vaurca" - return - else - user << "The [src] have already been clipped!" - update_icon() - return - - return - ..() /obj/item/clothing/gloves/update_icon() diff --git a/html/changelogs/alberyk-nofunallowed.yml b/html/changelogs/alberyk-nofunallowed.yml new file mode 100644 index 00000000000..c3b64af5676 --- /dev/null +++ b/html/changelogs/alberyk-nofunallowed.yml @@ -0,0 +1,6 @@ +author: Alberyk +delete-after: True + +changes: + - tweak: "Cutting any gloves fingertips will now reduce the insulation of the gloves in question." + - rscadd: "Added a pair of tajaran and unathi insulated gloves to the chief engineer and electrical supplies closets."