From d9dafa9649b73145092dc000fdb33b02b5b95c92 Mon Sep 17 00:00:00 2001 From: xxalpha Date: Sat, 18 Oct 2014 13:41:24 +0100 Subject: [PATCH] Fix cyborg flashes being useable in flashers and cyborg heads. --- code/WorkInProgress/Sigyn/Softcurity/jobs.dm | 4 ++-- .../WorkInProgress/Sigyn/Softcurity/secure_closet.dm | 6 +++--- code/game/jobs/job/security.dm | 4 ++-- code/game/machinery/flasher.dm | 4 ++++ code/game/objects/items/devices/flash.dm | 4 +++- code/game/objects/items/robot/robot_parts.dm | 5 +++++ code/game/objects/items/weapons/storage/belt.dm | 2 +- code/game/objects/items/weapons/storage/boxes.dm | 12 ++++++------ .../crates_lockers/closets/secure/engineering.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 2 +- .../crates_lockers/closets/secure/scientist.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 6 +++--- code/modules/clothing/suits/jobs.dm | 2 +- code/modules/research/designs/medical_designs.dm | 2 +- 14 files changed, 34 insertions(+), 23 deletions(-) diff --git a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm index 31012173420..7ef0b8ccddb 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm @@ -49,7 +49,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) @@ -115,7 +115,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_r_store) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) diff --git a/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm index 3631930e596..49ae813fab0 100644 --- a/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm +++ b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm @@ -49,7 +49,7 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/weapon/storage/id_kit(src) new /obj/item/weapon/storage/id_kit( src ) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) return @@ -73,7 +73,7 @@ new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/storage/belt/security(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/melee/baton(src) new /obj/item/weapon/gun/energy/taser(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) @@ -122,7 +122,7 @@ new /obj/item/weapon/storage/backpack/satchel_sec(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/storage/belt/security(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/clothing/glasses/sunglasses(src) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 5aa5448c8c3..613b07e545c 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -84,7 +84,7 @@ Warden H.equip_to_slot_or_del(new /obj/item/clothing/head/warden(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) @@ -175,7 +175,7 @@ Security Officer H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/flash/handheld(H), slot_l_store) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/restraints/handcuffs(H), slot_r_store) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 72e0126433d..2f4ff236d45 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -46,7 +46,11 @@ bulb = null power_change() +<<<<<<< HEAD else if (istype(W, /obj/item/device/flash)) +======= + else if (istype(W, /obj/item/device/flash/handheld)) +>>>>>>> 364898b... Fix cyborg flashes being useable in flashers and cyborg heads. if (!bulb) user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") user.drop_item() diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 1c41c285f3e..1426a23b66b 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -156,4 +156,6 @@ name = "memorizer" desc = "If you see this, you're not likely to remember it any time soon." icon_state = "memorizer" - item_state = "nullrod" \ No newline at end of file + item_state = "nullrod" + +/obj/item/device/flash/handheld //this is now the regular pocket flashes \ No newline at end of file diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 3deee5d8cdc..05396c4ad5e 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -331,8 +331,13 @@ /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob) ..() +<<<<<<< HEAD if(istype(W, /obj/item/device/flash)) var/obj/item/device/flash/F = W +======= + if(istype(W, /obj/item/device/flash/handheld)) + var/obj/item/device/flash/handheld/F = W +>>>>>>> 364898b... Fix cyborg flashes being useable in flashers and cyborg heads. if(src.flash1 && src.flash2) user << "You have already inserted the eyes!" return diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index e2daf1f9994..cbbcf127d50 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -111,7 +111,7 @@ /obj/item/weapon/grenade/flashbang, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/restraints/handcuffs, - /obj/item/device/flash, + /obj/item/device/flash/handheld, /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_box, diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 225c52d6804..5e8b4cb57b5 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -182,12 +182,12 @@ /obj/item/weapon/storage/box/flashes/New() ..() - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) + new /obj/item/device/flash/handheld(src) /obj/item/weapon/storage/box/teargas name = "box of tear gas grenades (WARNING)" 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 649111df7cf..9d65b230e71 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -29,7 +29,7 @@ new /obj/item/weapon/airlock_painter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/multitool(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) return /obj/structure/closet/secure_closet/engineering_electrical diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index fa3032ad889..d26b92412c0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -120,7 +120,7 @@ new /obj/item/clothing/shoes/sneakers/brown (src) new /obj/item/device/radio/headset/heads/cmo(src) new /obj/item/weapon/storage/belt/medical(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/hypospray/CMO(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 9b0cef34c99..40a861b0c4b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -46,7 +46,7 @@ new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/suit/armor/reactive(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/device/laser_pointer(src) new /obj/item/clothing/under/rank/research_director/alt(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1b522da3be6..fa6318d376c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -49,7 +49,7 @@ new /obj/item/weapon/storage/box/ids(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/weapon/mining_voucher(src) return @@ -79,7 +79,7 @@ new /obj/item/weapon/shield/riot/tele(src) new /obj/item/clothing/mask/gas/sechailer/hos(src) new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/storage/belt/security(src) @@ -134,7 +134,7 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/mask/gas/sechailer(src) - new /obj/item/device/flash(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/grenade/flashbang(src) new /obj/item/weapon/gun/energy/taser(src) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index fbacb60a169..3fe024e44e8 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -20,7 +20,7 @@ item_state = "bio_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen) //Chaplain /obj/item/clothing/suit/chaplain_hoodie diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index c2e2ebf5e6a..8d9fabe0630 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -52,7 +52,7 @@ datum/design/synthetic_flash build_type = MECHFAB materials = list("$metal" = 750, "$glass" = 750) reliability = 76 - build_path = /obj/item/device/flash/ + build_path = /obj/item/device/flash/handheld category = "Misc" datum/design/bluespacebeaker