From 54db9ded4db128d2342e87bbc1fe348daf765ec0 Mon Sep 17 00:00:00 2001 From: phil235 Date: Mon, 22 Feb 2016 01:44:53 +0100 Subject: [PATCH] Moved janitorial sign in a new weapons/miscellaneous.dm Made holosign_creator/afterattack() a bit better. Fixed merge conflict fixing error. Fixes typos in holosign_creator.dm --- .../objects/items/weapons/holosign_creator.dm | 30 ++++-------------- .../objects/items/weapons/miscellaneous.dm | 12 +++++++ icons/effects/effects.dmi | Bin 391102 -> 391535 bytes tgstation.dme | 1 + 4 files changed, 20 insertions(+), 23 deletions(-) create mode 100644 code/game/objects/items/weapons/miscellaneous.dm diff --git a/code/game/objects/items/weapons/holosign_creator.dm b/code/game/objects/items/weapons/holosign_creator.dm index 8f5c93b5a87..e33bb121435 100644 --- a/code/game/objects/items/weapons/holosign_creator.dm +++ b/code/game/objects/items/weapons/holosign_creator.dm @@ -1,6 +1,6 @@ /obj/item/weapon/holosign_creator name = "holographic sign projector" - desc = "A handy-dandy hologaphic projector that displays a janitorial sign." + desc = "A handy-dandy holographic projector that displays a janitorial sign." icon = 'icons/obj/device.dmi' icon_state = "signmaker" item_state = "electronic" @@ -28,10 +28,7 @@ signs.Remove(H) qdel(H) else - if(!T.density) //can't put holograms on a tile that has dense stuff - for(var/atom/movable/AM in T) - if(AM.density) - return + if(!is_blocked_turf(T)) //can't put holograms on a tile that has dense stuff if(holocreator_busy) user << "[src] is busy creating a hologram." return @@ -43,11 +40,10 @@ holocreator_busy = 0 return holocreator_busy = 0 - if(signs.len >= max_signs || T.density) + if(signs.len >= max_signs) + return + if(is_blocked_turf(T)) //don't try to sneak dense stuff on our tile during the wait. return - for(var/atom/movable/AM in T) //don't try to sneak dense stuff on our tile during the wait. - if(AM.density) - return H = new holosign_type(get_turf(target)) signs += H user << "You create \a [H] with [src]." @@ -68,7 +64,7 @@ /obj/item/weapon/holosign_creator/security name = "security holobarrier projector" - desc = "A hologaphic projector that creates holographic security barriers." + desc = "A holographic projector that creates holographic security barriers." icon_state = "signmaker_sec" holosign_type = /obj/effect/overlay/holograph/barrier creation_time = 30 @@ -76,7 +72,7 @@ /obj/item/weapon/holosign_creator/engineering name = "engineering holobarrier projector" - desc = "A hologaphic projector that creates holographic engineering barriers." + desc = "A holographic projector that creates holographic engineering barriers." icon_state = "signmaker_engi" holosign_type = /obj/effect/overlay/holograph/barrier/engineering creation_time = 30 @@ -175,15 +171,3 @@ /obj/effect/overlay/holograph/barrier/engineering icon_state = "holosign_engi" - -/obj/item/weapon/caution - desc = "Caution! Wet Floor!" - name = "wet floor sign" - icon = 'icons/obj/janitor.dmi' - icon_state = "caution" - force = 1 - throwforce = 3 - throw_speed = 2 - throw_range = 5 - w_class = 2 - attack_verb = list("warned", "cautioned", "smashed") diff --git a/code/game/objects/items/weapons/miscellaneous.dm b/code/game/objects/items/weapons/miscellaneous.dm new file mode 100644 index 00000000000..30834332290 --- /dev/null +++ b/code/game/objects/items/weapons/miscellaneous.dm @@ -0,0 +1,12 @@ + +/obj/item/weapon/caution + desc = "Caution! Wet Floor!" + name = "wet floor sign" + icon = 'icons/obj/janitor.dmi' + icon_state = "caution" + force = 1 + throwforce = 3 + throw_speed = 2 + throw_range = 5 + w_class = 2 + attack_verb = list("warned", "cautioned", "smashed") diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 8b0fa127334325bb3caca3ceb8a715bbf6386f63..72f8cda410f6ed5314c29deaf3257f614c24bc91 100644 GIT binary patch delta 6914 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 BO&b6J delta 6496 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 O>y50kOzBJGp#KAUV*I55 diff --git a/tgstation.dme b/tgstation.dme index 88ca56ca41e..97e1d9da476 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -603,6 +603,7 @@ #include "code\game\objects\items\weapons\holy_weapons.dm" #include "code\game\objects\items\weapons\kitchen.dm" #include "code\game\objects\items\weapons\manuals.dm" +#include "code\game\objects\items\weapons\miscellaneous.dm" #include "code\game\objects\items\weapons\mop.dm" #include "code\game\objects\items\weapons\paint.dm" #include "code\game\objects\items\weapons\paiwire.dm"