From 7c50d3fb8fcc0ff4eb1064d3ae2b8afa5a4532e4 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sun, 9 Apr 2017 18:41:14 -0400 Subject: [PATCH] Clean up some paper bin warnings (#25987) * Cerestation paperbins * Fix more --- _maps/map_files/Cerestation/cerestation.dmm | 14 -------------- _maps/map_files/debug/runtimestation.dmm | 2 +- code/modules/paperwork/paperbin.dm | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index 2dec8012bde..359373842ca 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -4050,7 +4050,6 @@ "ahX" = ( /obj/structure/table, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/device/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; @@ -6017,7 +6016,6 @@ "alU" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/captain, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -9932,7 +9930,6 @@ "ato" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/cmo, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -9992,7 +9989,6 @@ "atw" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/ce, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -10341,7 +10337,6 @@ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12929,7 +12924,6 @@ "ayU" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/hos, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13045,7 +13039,6 @@ "azh" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/rd, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13317,7 +13310,6 @@ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -14981,7 +14973,6 @@ "aCH" = ( /obj/structure/table, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/machinery/light, /turf/open/floor/plasteel/darkblue/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -16788,7 +16779,6 @@ "aFE" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/qm, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20261,7 +20251,6 @@ "aLQ" = ( /obj/structure/table/wood, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -20313,7 +20302,6 @@ "aLW" = ( /obj/structure/table, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /obj/item/weapon/stamp/hop, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -57068,7 +57056,6 @@ "bVW" = ( /obj/structure/table, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -75772,7 +75759,6 @@ "cCR" = ( /obj/structure/table, /obj/item/weapon/paper_bin, -/obj/item/weapon/pen, /turf/open/floor/plasteel/red/side{ tag = "icon-red (NORTHWEST)"; icon_state = "red"; diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 15683c31539..b3facda8d26 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -139,7 +139,7 @@ "cI" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/open/floor/plasteel/arrival{dir = 8},/area/hallway/secondary/entry) "cJ" = (/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/open/floor/plasteel/arrival{dir = 10},/area/hallway/secondary/entry) "cK" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/machinery/light,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry) -"cL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3;pixel_y = 7},/obj/item/weapon/pen,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry) +"cL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3;pixel_y = 7},/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry) "cM" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/regular,/obj/item/device/healthanalyzer,/turf/open/floor/plasteel/arrival,/area/hallway/secondary/entry) "cN" = (/turf/closed/wall/r_wall,/area/construction) "cO" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/closed/wall/r_wall,/area/construction) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 941f645ef59..2fca29b45c5 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -24,7 +24,7 @@ bin_pen = P update_icon() var/static/warned = FALSE - if(!warned) + if(P.type == /obj/item/weapon/pen && !warned) warning("one or more paperbins ate a pen duing initialize()") warned = TRUE