From 6423a2f56b493804c105ddcba30a8b37c9892013 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 20 Jun 2021 13:25:55 -0400 Subject: [PATCH] Fix PR --- code/_helpers/global_lists.dm | 10 ---- code/_helpers/global_lists_vr.dm | 3 ++ .../effects/decals/posters/polarisposters.dm | 4 -- .../decals/posters/polarisposters_vr.dm | 2 +- .../effects/decals/posters/voreposters_vr.dm | 54 +++++++++---------- code/game/objects/items/contraband_vr.dm | 2 +- code/game/objects/random/misc.dm | 5 -- code/game/objects/random/mob_vr.dm | 2 +- code/game/objects/structures/trash_pile_vr.dm | 2 +- code/global_init.dm | 3 -- maps/gateway_archive_vr/Academy.dmm | 2 +- .../gateway_archive_vr/blackmarketpackers.dmm | 2 +- maps/gateway_archive_vr/snow_outpost.dmm | 2 +- maps/gateway_archive_vr/spacebattle.dmm | 2 +- maps/gateway_archive_vr/zoo.dmm | 2 +- maps/gateway_vr/snow_outpost.dmm | 2 +- maps/gateway_vr/zoo.dmm | 2 +- maps/offmap_vr/om_ships/aro2.dmm | 2 +- maps/submaps/admin_use_vr/tradeship.dmm | 10 ++-- maps/submaps/pois_vr/aerostat/Drugden.dmm | 2 +- .../pois_vr/debris_field/mining_drones.dmm | 2 +- 21 files changed, 49 insertions(+), 68 deletions(-) diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index c073d7acf3f..232c523b653 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -26,16 +26,6 @@ var/list/mannequins_ // Times that players are allowed to respawn ("ckey" = world.time) GLOBAL_LIST_EMPTY(respawn_timers) -<<<<<<< HEAD -// Closets have magic appearances -GLOBAL_LIST_EMPTY(closet_appearances) - -// Posters -var/global/list/poster_designs = list() -var/global/list/NT_poster_designs = list() - -======= ->>>>>>> beaf109... Refactors posters to use decls (#8128) // Holomaps var/global/list/holomap_markers = list() var/global/list/mapping_units = list() diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 0d2ed5e5d63..4df7afe9b44 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -13,6 +13,9 @@ var/global/list/active_ghost_pods = list() var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") +// Closets have magic appearances +GLOBAL_LIST_EMPTY(closet_appearances) + //stores numeric player size options indexed by name var/global/list/player_sizes_list = list( "Macro" = RESIZE_HUGE, diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm index 4dc444ade5b..dab48460cd6 100644 --- a/code/game/objects/effects/decals/posters/polarisposters.dm +++ b/code/game/objects/effects/decals/posters/polarisposters.dm @@ -291,13 +291,9 @@ The image seems important." listing_name = "Safety - Mech Operation" -<<<<<<< HEAD //VOREStation Removal Start /* -/datum/poster/nanotrasen/nt_4 -======= /decl/poster/nanotrasen/nt_4 ->>>>>>> beaf109... Refactors posters to use decls (#8128) icon_state = "ntposter04" name = "Beware Aetotheans" desc = "This poster displays a distinctly hostile-looking red Promethean in a black coat. The fine-print around the edges warns the reader about the dangers posed by Almachi Prometheans." diff --git a/code/game/objects/effects/decals/posters/polarisposters_vr.dm b/code/game/objects/effects/decals/posters/polarisposters_vr.dm index 50453462893..1ab7104c348 100644 --- a/code/game/objects/effects/decals/posters/polarisposters_vr.dm +++ b/code/game/objects/effects/decals/posters/polarisposters_vr.dm @@ -1,4 +1,4 @@ -/datum/poster/nanotrasen/nt_7 +/decl/poster/nanotrasen/nt_7 name = "SolCom" desc = "This poster showcases an TCG emblem. The outer ring reads,\ \"NIL MORTALIBUS ARDUI EST\".\ diff --git a/code/game/objects/effects/decals/posters/voreposters_vr.dm b/code/game/objects/effects/decals/posters/voreposters_vr.dm index c08869a05f0..7d999abcd5a 100644 --- a/code/game/objects/effects/decals/posters/voreposters_vr.dm +++ b/code/game/objects/effects/decals/posters/voreposters_vr.dm @@ -1,108 +1,108 @@ -/datum/poster/vore_1 +/decl/poster/vore_1 icon_state = "sbsposter1" name = "Best Girl Pip" desc = "A poster of the official NT Best Girl Mascot, Pip" -/datum/poster/vore_2 +/decl/poster/vore_2 icon_state = "sbsposter2" name = "AroButt" desc = "A lewd view of KHI's cutest fops." -/datum/poster/vore_3 +/decl/poster/vore_3 icon_state = "sbsposter3" name = "Poster This Dog" desc = "Post this dog." -/datum/poster/vore_4 +/decl/poster/vore_4 icon_state = "sbsposter4" name = "PAT" desc = "A poster containing very obvious PAT propoganda." -/datum/poster/vore_5 +/decl/poster/vore_5 icon_state = "sbsposter5" name = "The Inn" desc = "A poster of a certain black-eyed shadekin." -/datum/poster/vore_6 +/decl/poster/vore_6 icon_state = "sbsposter6" name = "Mawletta" desc = "The best view in the system." -/datum/poster/vore_8 +/decl/poster/vore_8 icon_state = "sbsposter8" name = "Shitty Timbs" desc = "A special edition, brand deal, Shitty Tim Concert Poster." -/datum/poster/vore_9 +/decl/poster/vore_9 icon_state = "sbsposter9" name = "Shitty Tim" desc = "A Shitty Tim concert poster." -/datum/poster/vore_11 +/decl/poster/vore_11 icon_state = "sbsposter11" name = "Fear" desc = "Depicted on this poster is a monster crackling with crimson energy that seems to drip off its body. The word 'RUN' is printed across the bottom." -/datum/poster/vore_12 +/decl/poster/vore_12 icon_state = "sbsposter12" name = "Baa" desc = "A lewd exclusive poster of a certain security commander, taken from a old 'New Ewe' magazine!" -/datum/poster/vore_13 +/decl/poster/vore_13 icon_state = "sbsposter13" name = "Ammer" desc = "You see a blue panda on the poster. She's awfully smug about her size." -/datum/poster/vore_14 +/decl/poster/vore_14 icon_state = "dwposter1" name = "WANTED: WAR CRIMINAL" desc = "A poster bringing awareness to the distinguishing costume of a known war criminal operating in Virgo-Erigonne space." -/datum/poster/vore_15 +/decl/poster/vore_15 icon_state = "dwposter2" name = "Implanter" desc = "A poster explaining the benefits and function of back-up implanters." -/datum/poster/vore_16 +/decl/poster/vore_16 icon_state = "dwposter3" name = "Back-up implant" desc = "A poster describing the electronics implanted by back-up implanters." -/datum/poster/vore_17 +/decl/poster/vore_17 icon_state = "dwposter4" name = "We know" desc = "A poster purporting the infallibility of NanoTrasen's forensics department." -/datum/poster/vore_18 +/decl/poster/vore_18 icon_state = "dwposter5" name = "KAT" desc = "A promotional poster for popular exotube show 'Kat-Kat Korner'" -/datum/poster/vore_19 +/decl/poster/vore_19 icon_state = "dwposter6" name = "install.css" desc = "A nostalgia trip." -/datum/poster/vore_20 +/decl/poster/vore_20 icon_state = "dwposter7" name = "TALON" desc = "The logo and banner of a notable group of contractors known to trade with NanoTrasen." -/datum/poster/vore_21 +/decl/poster/vore_21 icon_state = "dwposter8" name = "GPA" desc = "A pretentious advertisement for the drink 'Galactic Panic Attack'" -/datum/poster/vore_22 +/decl/poster/vore_22 icon_state = "dwposter9" name = "Rope" desc = "A poster outlining proper pit-traversal gear." -/datum/poster/vore_23 +/decl/poster/vore_23 icon_state = "dwposter10" name = "Visit Luna" desc = "Part of a tourism campaign from SolCom encouraging people to visit Earth's moon, Luna." -/datum/poster/vore_24 +/decl/poster/vore_24 icon_state = "dwposter11" name = "Secgun" desc = "A striking, wordless advertisement for NanoTrasen's security department. It wasn't very effective and just seems to be used as a warning sign." -/datum/poster/vore_25 +/decl/poster/vore_25 icon_state = "sbsposter14" name = "Awoo" desc = "A top contender for 'images you can hear'." -/datum/poster/vore_26 +/decl/poster/vore_26 icon_state = "sbsposter15" name = "LikeEmSmall" desc = "An advertisement for a defunct dating service for normal-sized individuals to find micro partners." -/datum/poster/vore_27 +/decl/poster/vore_27 icon_state = "sbsposter16" name = "Borgar" desc = "What do you want from Space McDonalds?" -/datum/poster/vore_28 +/decl/poster/vore_28 icon_state = "sbsposter17" name = "DiveIn" desc = "A limited edition holographic poster that seems to feature subliminal suggestions and conditioning." -/datum/poster/vore_29 +/decl/poster/vore_29 icon_state = "sbsposter18" name = "Perdition" desc = "You get the feeling that whomever made this intended for you to feel very differently than you do when you look at it." diff --git a/code/game/objects/items/contraband_vr.dm b/code/game/objects/items/contraband_vr.dm index b7b70f74a6d..2bb1df1dd2b 100644 --- a/code/game/objects/items/contraband_vr.dm +++ b/code/game/objects/items/contraband_vr.dm @@ -59,7 +59,7 @@ /obj/item/weapon/card/emag, /obj/item/weapon/card/emag_broken, /obj/item/weapon/card/id/syndicate, - /obj/item/weapon/contraband/poster, + /obj/item/poster, /obj/item/weapon/disposable_teleporter, /obj/item/weapon/grenade/flashbang/clusterbang, /obj/item/weapon/grenade/flashbang/clusterbang, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 3c872f86fa4..e4d18b5cc61 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -259,12 +259,7 @@ icon_state = "purplecomb" spawn_nothing_percentage = 50 /obj/random/contraband/item_to_spawn() -<<<<<<< HEAD return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit, - prob(8);/obj/item/weapon/haircomb, -======= - return pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, ->>>>>>> beaf109... Refactors posters to use decls (#8128) prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/zoom, prob(4);/obj/item/weapon/material/butterfly, diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index fdb41ada596..08aa96e22e2 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -143,7 +143,7 @@ spawn_nothing_percentage = 0 /obj/random/cargopod/item_to_spawn() - return pick(prob(10);/obj/item/weapon/contraband/poster,\ + return pick(prob(10);/obj/item/poster,\ prob(8);/obj/item/weapon/haircomb,\ prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol,\ prob(6);/obj/item/weapon/material/butterflyblade,\ diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 97883c6cb92..8c85871f768 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -187,7 +187,7 @@ prob(2);/obj/item/device/flashlight/glowstick/blue, prob(2);/obj/item/weapon/card/emag_broken, prob(2);/obj/item/weapon/cell/super, - prob(2);/obj/item/weapon/contraband/poster, + prob(2);/obj/item/poster, prob(2);/obj/item/weapon/reagent_containers/glass/rag, prob(2);/obj/item/weapon/storage/box/sinpockets, prob(2);/obj/item/weapon/storage/secure/briefcase, diff --git a/code/global_init.dm b/code/global_init.dm index 200a4dd9d98..a9abaae9ad2 100644 --- a/code/global_init.dm +++ b/code/global_init.dm @@ -22,11 +22,8 @@ var/global/datum/global_init/init = new () error_log = file("[log_path]-error.log") debug_log = file("[log_path]-debug.log") debug_log << "[log_end]\n[log_end]\nStarting up. [time_stamp()][log_end]\n---------------------[log_end]" -<<<<<<< HEAD */ //VOREStation Removal End -======= decls_repository = new() ->>>>>>> beaf109... Refactors posters to use decls (#8128) load_configuration() makeDatumRefLists() diff --git a/maps/gateway_archive_vr/Academy.dmm b/maps/gateway_archive_vr/Academy.dmm index fc353d5b2d1..90aa18dea9f 100644 --- a/maps/gateway_archive_vr/Academy.dmm +++ b/maps/gateway_archive_vr/Academy.dmm @@ -3104,7 +3104,7 @@ /obj/structure/closet, /obj/item/weapon/reagent_containers/food/drinks/beer, /obj/item/clothing/under/purple, -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor, /area/awaymission/academy/academyaft) "hV" = ( diff --git a/maps/gateway_archive_vr/blackmarketpackers.dmm b/maps/gateway_archive_vr/blackmarketpackers.dmm index ef10c6addf9..d9f05180a68 100644 --- a/maps/gateway_archive_vr/blackmarketpackers.dmm +++ b/maps/gateway_archive_vr/blackmarketpackers.dmm @@ -3332,7 +3332,7 @@ /turf/simulated/floor/plating, /area/awaymission/BMPship3) "iG" = ( -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/plating, /area/awaymission/BMPship3) "iH" = ( diff --git a/maps/gateway_archive_vr/snow_outpost.dmm b/maps/gateway_archive_vr/snow_outpost.dmm index c3d57c4eceb..64650440f59 100644 --- a/maps/gateway_archive_vr/snow_outpost.dmm +++ b/maps/gateway_archive_vr/snow_outpost.dmm @@ -2158,7 +2158,7 @@ /area/awaymission/snow_outpost/outside) "hm" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/outside) "hn" = ( diff --git a/maps/gateway_archive_vr/spacebattle.dmm b/maps/gateway_archive_vr/spacebattle.dmm index 1b3fa8726c2..f84ac26105a 100644 --- a/maps/gateway_archive_vr/spacebattle.dmm +++ b/maps/gateway_archive_vr/spacebattle.dmm @@ -2133,7 +2133,7 @@ /area/awaymission/spacebattle/cruiser) "gg" = ( /obj/structure/closet/crate, -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gh" = ( diff --git a/maps/gateway_archive_vr/zoo.dmm b/maps/gateway_archive_vr/zoo.dmm index 9edcbd01e89..3ed7fe26f83 100644 --- a/maps/gateway_archive_vr/zoo.dmm +++ b/maps/gateway_archive_vr/zoo.dmm @@ -373,7 +373,7 @@ "hi" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) "hj" = (/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{maxhealth = 10000; name = "robust borosilicate window"},/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/grille,/turf/simulated/floor/plating,/area/awaymission/zoo) "hk" = (/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) -"hl" = (/obj/item/weapon/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) +"hl" = (/obj/item/poster,/turf/simulated/floor/plating,/area/awaymission/zoo/pirateship) "hm" = (/obj/machinery/door/window/northright,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "hn" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{dir = 4; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{dir = 1; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/obj/structure/window/phoronreinforced{dir = 8; icon_state = "phoronrwindow"; maxhealth = 10000; name = "robust borosilicate window";},/turf/simulated/floor/plating,/area/awaymission/zoo) "ho" = (/obj/structure/flora/pottedplant{icon_state = "plant-24"},/turf/simulated/floor/tiled,/area/awaymission/zoo) diff --git a/maps/gateway_vr/snow_outpost.dmm b/maps/gateway_vr/snow_outpost.dmm index 6dfd70f91fe..f5af2819847 100644 --- a/maps/gateway_vr/snow_outpost.dmm +++ b/maps/gateway_vr/snow_outpost.dmm @@ -2168,7 +2168,7 @@ /area/awaymission/snow_outpost/dark) "hm" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/carpet, /area/awaymission/snow_outpost/dark) "hn" = ( diff --git a/maps/gateway_vr/zoo.dmm b/maps/gateway_vr/zoo.dmm index 7039ea57186..831eae8e7f3 100644 --- a/maps/gateway_vr/zoo.dmm +++ b/maps/gateway_vr/zoo.dmm @@ -2518,7 +2518,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hl" = ( -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/plating, /area/awaymission/zoo/pirateship) "hm" = ( diff --git a/maps/offmap_vr/om_ships/aro2.dmm b/maps/offmap_vr/om_ships/aro2.dmm index b6a955a65c9..458416f4b83 100644 --- a/maps/offmap_vr/om_ships/aro2.dmm +++ b/maps/offmap_vr/om_ships/aro2.dmm @@ -403,7 +403,7 @@ /obj/structure/sign/poster{ dir = 1; icon_state = ""; - poster_type = "/datum/poster/vore_2" + poster_decl = "/decl/poster/vore_2" }, /turf/simulated/wall, /area/aro2/cockpit) diff --git a/maps/submaps/admin_use_vr/tradeship.dmm b/maps/submaps/admin_use_vr/tradeship.dmm index 1b3e5f2971b..e196914075b 100644 --- a/maps/submaps/admin_use_vr/tradeship.dmm +++ b/maps/submaps/admin_use_vr/tradeship.dmm @@ -1389,11 +1389,11 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/item/weapon/contraband/poster, -/obj/item/weapon/contraband/poster, -/obj/item/weapon/contraband/poster, -/obj/item/weapon/contraband/poster, -/obj/item/weapon/contraband/poster, +/obj/item/poster, +/obj/item/poster, +/obj/item/poster, +/obj/item/poster, +/obj/item/poster, /turf/simulated/shuttle/floor/black, /area/shuttle/trade) "dg" = ( diff --git a/maps/submaps/pois_vr/aerostat/Drugden.dmm b/maps/submaps/pois_vr/aerostat/Drugden.dmm index 1966dbcab8c..396a44e977e 100644 --- a/maps/submaps/pois_vr/aerostat/Drugden.dmm +++ b/maps/submaps/pois_vr/aerostat/Drugden.dmm @@ -90,7 +90,7 @@ /area/submap/virgo2/Drugd) "v" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/contraband/poster, +/obj/item/poster, /turf/simulated/floor/carpet, /area/submap/virgo2/Drugd) "w" = ( diff --git a/maps/submaps/pois_vr/debris_field/mining_drones.dmm b/maps/submaps/pois_vr/debris_field/mining_drones.dmm index 57fee61a6fe..5fa8f77d65d 100644 --- a/maps/submaps/pois_vr/debris_field/mining_drones.dmm +++ b/maps/submaps/pois_vr/debris_field/mining_drones.dmm @@ -91,7 +91,7 @@ "q" = ( /obj/structure/sign/poster{ pixel_y = 32; - poster_type = "/datum/poster/bay_50" + poster_decl = "/decl/poster/bay_50" }, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_outpost)