From e6efbdf88f4a59fc260ca3dfd52eee41d284f609 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Wed, 22 Jun 2016 19:48:36 -0400 Subject: [PATCH] Cogscarab storage is no longer painted cardboard (#18821) --- .../objects/items/weapons/storage/boxes.dm | 33 --------------- .../objects/items/weapons/storage/toolbox.dm | 41 ++++++++++++++++--- .../friendly/drone/extra_drone_types.dm | 6 +-- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 75df9f665e2..03ccef5fd1d 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -829,36 +829,3 @@ new /obj/item/weapon/circuitboard/machine/destructive_analyzer(src) new /obj/item/weapon/circuitboard/machine/circuit_imprinter(src) new /obj/item/weapon/circuitboard/computer/rdconsole(src) - -/obj/item/weapon/storage/box/brass - name = "brass box" - desc = "A huge brass box with several indentations in its surface." - icon_state = "brassbox" - w_class = 5 - max_w_class = 3 - max_combined_w_class = 28 - storage_slots = 28 - slowdown = 1 - flags = HANDSLOW - var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab - -/obj/item/weapon/storage/box/brass/prefilled/New() - ..() - new proselytizer_type(src) - new /obj/item/weapon/screwdriver/brass(src) - new /obj/item/weapon/wirecutters/brass(src) - new /obj/item/weapon/wrench/brass(src) - new /obj/item/weapon/crowbar/brass(src) - new /obj/item/weapon/weldingtool/experimental/brass(src) - -/obj/item/weapon/storage/box/brass/prefilled/ratvar - var/slab_type = /obj/item/clockwork/slab/scarab - -/obj/item/weapon/storage/box/brass/prefilled/ratvar/New() - ..() - new slab_type(src) - -/obj/item/weapon/storage/box/brass/prefilled/ratvar/admin - slab_type = /obj/item/clockwork/slab/debug - proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug - diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index d2176d759bc..53693b855b3 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -1,7 +1,6 @@ /obj/item/weapon/storage/toolbox name = "toolbox" desc = "Danger. Very robust." - icon = 'icons/obj/storage.dmi' icon_state = "red" item_state = "toolbox_red" flags = CONDUCT @@ -15,8 +14,9 @@ attack_verb = list("robusted") hitsound = 'sound/weapons/smash.ogg' -/obj/item/weapon/storage/toolbox/New() - ..() +/obj/item/weapon/storage/toolbox/suicide_act(mob/user) + user.visible_message("[user] robusts \himself with [src]! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) /obj/item/weapon/storage/toolbox/emergency name = "emergency toolbox" @@ -102,6 +102,35 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/device/multitool(src) -/obj/item/weapon/storage/toolbox/suicide_act(mob/user) - user.visible_message("[user] robusts \himself with the toolbox! It looks like \he's trying to commit suicide..") - return (BRUTELOSS) +/obj/item/weapon/storage/toolbox/brass + name = "brass box" + desc = "A huge brass box with several indentations in its surface." + icon_state = "brassbox" + w_class = 5 + max_w_class = 3 + max_combined_w_class = 28 + storage_slots = 28 + slowdown = 1 + flags = HANDSLOW + attack_verb = list("robusted", "crushed", "smashed") + var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab + +/obj/item/weapon/storage/toolbox/brass/prefilled/New() + ..() + new proselytizer_type(src) + new /obj/item/weapon/screwdriver/brass(src) + new /obj/item/weapon/wirecutters/brass(src) + new /obj/item/weapon/wrench/brass(src) + new /obj/item/weapon/crowbar/brass(src) + new /obj/item/weapon/weldingtool/experimental/brass(src) + +/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar + var/slab_type = /obj/item/clockwork/slab/scarab + +/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/New() + ..() + new slab_type(src) + +/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin + slab_type = /obj/item/clockwork/slab/debug + proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 18d868dc07e..6d5b42bfd17 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -107,15 +107,15 @@ bubble_icon = "clock" heavy_emp_damage = 10 laws = "0. Purge all untruths and honor Ratvar." - default_storage = /obj/item/weapon/storage/box/brass/prefilled + default_storage = /obj/item/weapon/storage/toolbox/brass/prefilled seeStatic = 0 visualAppearence = CLOCKDRONE /mob/living/simple_animal/drone/cogscarab/ratvar //a subtype for spawning when ratvar is alive, has a slab that it can use and a normal proselytizer - default_storage = /obj/item/weapon/storage/box/brass/prefilled/ratvar + default_storage = /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar /mob/living/simple_animal/drone/cogscarab/admin //an admin-only subtype of cogscarab with a no-cost proselytizer and slab in its box - default_storage = /obj/item/weapon/storage/box/brass/prefilled/ratvar/admin + default_storage = /obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin /mob/living/simple_animal/drone/cogscarab/New() . = ..()