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 8b0fa127334..72f8cda410f 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
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"