diff --git a/code/modules/paperwork/paper_poster.dm b/code/modules/paperwork/paper_poster.dm new file mode 100644 index 0000000000..7f0c7d2264 --- /dev/null +++ b/code/modules/paperwork/paper_poster.dm @@ -0,0 +1,34 @@ +/obj/item/sticky_pad/poster + name = "adhesive poster pad" + desc = "A stack of A3 papers with adhesive strips for attaching to walls." + icon = 'icons/obj/stickyposter.dmi' + color = COLOR_WHITE + icon_state = "poster_full" + description_info = "Click to remove a sticky poster from the pile. Click-drag to yourself to pick up the stack. Sticky posters stuck to surfaces/objects will persist for 50 rounds." + paper_type = /obj/item/paper/sticky/poster + +/obj/item/sticky_pad/poster/update_icon() + if(papers <= 15) + icon_state = "poster_empty" + else if(papers <= 50) + icon_state = "poster_used" + else + icon_state = "poster_full" + if(written_text) + icon_state = "[icon_state]_writing" + +/obj/item/sticky_pad/poster/yellow + color = COLOR_YELLOW + +/obj/item/sticky_pad/poster/blue + color = COLOR_BABY_BLUE + +/obj/item/sticky_pad/poster/command + color = COLOR_COMMAND_BLUE + +/obj/item/paper/sticky/poster + name = "adhesive poster" + desc = "An A3 sheet of paper with adhesive strips for attaching to walls." + icon = 'icons/obj/stickyposter.dmi' + color = COLOR_WHITE + stickytype = /datum/persistent/paper/sticky/poster \ No newline at end of file diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index d6366cd5ae..fe8ae355b8 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -50,11 +50,10 @@ /obj/item/sticky_pad/examine(var/mob/user) . = ..() if(.) - to_chat(user, SPAN_NOTICE("It has [papers] sticky note\s left.")) + to_chat(user, SPAN_NOTICE("It has [papers] [name]\s left in the stack.")) /obj/item/sticky_pad/attack_hand(var/mob/user) var/obj/item/paper/paper = new paper_type(get_turf(src)) - paper.set_content(written_text, "sticky note") paper.last_modified_ckey = written_by paper.color = color written_text = null @@ -94,13 +93,14 @@ icon = 'icons/obj/stickynotes.dmi' color = COLOR_YELLOW slot_flags = 0 + var/stickytype = /datum/persistent/paper/sticky /obj/item/paper/sticky/Initialize() . = ..() GLOB.moved_event.register(src, src, /obj/item/paper/sticky/proc/reset_persistence_tracking) /obj/item/paper/sticky/proc/reset_persistence_tracking() - SSpersistence.forget_value(src, /datum/persistent/paper/sticky) + SSpersistence.forget_value(src, stickytype) pixel_x = 0 pixel_y = 0 @@ -135,7 +135,7 @@ return if(user.unEquip(src, source_turf)) - SSpersistence.track_value(src, /datum/persistent/paper/sticky) + SSpersistence.track_value(src, stickytype) if(params) var/list/mouse_control = params2list(params) if(mouse_control["icon-x"]) diff --git a/code/modules/persistence/effects/paper_sticky_poster.dm b/code/modules/persistence/effects/paper_sticky_poster.dm new file mode 100644 index 0000000000..ede0c9060f --- /dev/null +++ b/code/modules/persistence/effects/paper_sticky_poster.dm @@ -0,0 +1,3 @@ +/datum/persistent/paper/sticky/poster + name = "stickyposters" + paper_type = /obj/item/paper/sticky/poster diff --git a/icons/obj/stickynotes.dmi b/icons/obj/stickynotes.dmi index 8ca70a4149..429d5ef490 100644 Binary files a/icons/obj/stickynotes.dmi and b/icons/obj/stickynotes.dmi differ diff --git a/icons/obj/stickyposter.dmi b/icons/obj/stickyposter.dmi new file mode 100644 index 0000000000..e250abbc00 Binary files /dev/null and b/icons/obj/stickyposter.dmi differ diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index f6c6bbdb58..0031a87f1b 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -52932,8 +52932,8 @@ dir = 8 }, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /turf/simulated/floor/tiled/freezer, @@ -53161,13 +53161,13 @@ /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin" = 10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin" = 10); volume = 10 }, /turf/simulated/floor/wood, diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index a5b9cff7cb..1918e7e51e 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -313,9 +313,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 21 +/obj/structure/sign/calendar{ + pixel_x = 32 }, /turf/simulated/floor/wood, /area/unionoffice) @@ -2036,16 +2035,26 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/machinery/recharger, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 1 }, -/obj/item/gps, +/obj/item/paper_bin, +/obj/item/storage/fancy/markers, +/obj/item/storage/fancy/markers, +/obj/item/pen/red{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/pen/blue{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/sticky_pad/poster{ + pixel_x = -16 + }, /turf/simulated/floor/tiled, /area/surface/station/storage/art) "bvI" = ( @@ -3936,7 +3945,7 @@ /obj/effect/floor_decal/corner/white/border, /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/folder/white, +/obj/item/sticky_pad/poster/command, /turf/simulated/floor/tiled/techmaint, /area/surface/station/command/operations) "cAN" = ( @@ -7697,14 +7706,21 @@ /area/surface/station/maintenance/substation/security/snd) "fbe" = ( /obj/structure/table/glass, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/paper_bin{ + pixel_x = 9 + }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, +/obj/item/pen{ + pixel_x = 10 + }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, +/obj/item/sticky_pad/poster/blue{ + pixel_x = -6 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/office) "fbr" = ( @@ -9660,6 +9676,7 @@ pixel_y = 6 }, /obj/item/storage/secure/briefcase, +/obj/item/sticky_pad/poster, /turf/simulated/floor/wood, /area/unionoffice) "gpz" = ( @@ -10768,25 +10785,18 @@ /area/surface/station/rnd/research) "gTh" = ( /obj/structure/table/standard, -/obj/item/paper_bin, -/obj/item/pen/blue{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/pen/red{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/storage/fancy/markers{ - pixel_y = -3 - }, -/obj/item/storage/fancy/markers, /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 9 }, +/obj/item/sticky_pad/poster/yellow{ + pixel_x = -1 + }, +/obj/item/sticky_pad/poster/blue{ + pixel_y = 8 + }, /turf/simulated/floor/tiled, /area/surface/station/storage/art) "gTr" = ( @@ -11872,6 +11882,7 @@ /obj/random/tech_supply, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, +/obj/item/gps, /turf/simulated/floor/tiled, /area/surface/station/storage/art) "hCO" = ( @@ -21939,8 +21950,8 @@ "olt" = ( /obj/structure/bed/chair/wood/pine{ color = "#3a6ecf"; - name = "undersized chair"; - desc = "Damn, that's uncomfortable..." + desc = "Damn, that's uncomfortable..."; + name = "undersized chair" }, /turf/simulated/floor/wood, /area/unionoffice) @@ -24429,6 +24440,20 @@ }, /turf/simulated/floor/tiled, /area/surface/station/security/hallway/snd) +"pSm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/structure/table/standard, +/obj/item/sticky_pad/poster/yellow{ + pixel_x = 4 + }, +/obj/item/pen, +/turf/simulated/floor/tiled, +/area/surface/station/engineering/hallway/snd) "pSN" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -28793,6 +28818,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/surface/station/storage/art) "sKC" = ( @@ -30628,8 +30654,8 @@ /obj/item/storage/firstaid/regular, /obj/item/storage/pill_bottle/spaceacillin, /obj/item/reagent_containers/hypospray/autoinjector/detox{ - filled_reagents = list("anti_toxin"=10); amount_per_transfer_from_this = 10; + filled_reagents = list("anti_toxin"=10); volume = 10 }, /turf/simulated/floor/tiled, @@ -34499,8 +34525,9 @@ /area/surface/station/hallway/primary/secondfloor/east) "wvP" = ( /obj/effect/zone_divider, -/obj/structure/sign/calendar{ - pixel_x = 32 +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 21 }, /turf/simulated/floor/wood, /area/unionoffice) @@ -78168,7 +78195,7 @@ mDL utm erV lrc -hlh +pSm lmq tzF mrU diff --git a/polaris.dme b/polaris.dme index 9345afb8a4..1aaf9a3629 100644 --- a/polaris.dme +++ b/polaris.dme @@ -2766,6 +2766,7 @@ #include "code\modules\paperwork\handlabeler.dm" #include "code\modules\paperwork\paper.dm" #include "code\modules\paperwork\paper_bundle.dm" +#include "code\modules\paperwork\paper_poster.dm" #include "code\modules\paperwork\paper_sticky.dm" #include "code\modules\paperwork\paperbin.dm" #include "code\modules\paperwork\paperplane.dm" @@ -2795,6 +2796,7 @@ #include "code\modules\persistence\effects\graffiti.dm" #include "code\modules\persistence\effects\paper.dm" #include "code\modules\persistence\effects\paper_sticky.dm" +#include "code\modules\persistence\effects\paper_sticky_poster.dm" #include "code\modules\persistence\effects\trash.dm" #include "code\modules\persistence\storage\smartfridge.dm" #include "code\modules\persistence\storage\storage.dm"