From 530fbf11f504782adf48a3559674a1320d354287 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:23:37 +0200 Subject: [PATCH] Fluff paper tweaks (#19894) Fluff papers now update the free space on the paper correctly on initialization. Moved all the fluff paper in code, from the maps. Added maplinting for fluff papers. Added DMDoc for fluff papers. --- code/modules/paperwork/paper.dm | 47 +++-- .../fluffyghost-fluffpapertweak.yml | 61 ++++++ .../away/ships/freebooter/freebooter_ship_.dm | 4 + .../freebooter/freebooter_ship_submaps.dmm | 15 +- maps/event/idris_cruise/code/idris_cruise.dm | 12 ++ maps/event/idris_cruise/idris_cruise-1.dmm | 175 ++++------------- maps/event/rooftop/code/rooftop.dm | 12 ++ maps/event/rooftop/rooftop-1.dmm | 185 ++++-------------- tools/maplint/lints/paper_fluff.yml | 10 + 9 files changed, 206 insertions(+), 315 deletions(-) create mode 100644 html/changelogs/fluffyghost-fluffpapertweak.yml create mode 100644 tools/maplint/lints/paper_fluff.yml diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c1fa902985a..cc1638c7d59 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -96,7 +96,12 @@ else icon_state = "[base_state]" -/obj/item/paper/proc/update_space(var/new_text) +/** + * Updates the amount of free space in the paper + * + * * new_text - The new text the paper contains (supposedly), text + */ +/obj/item/paper/proc/update_space(new_text) if(new_text) free_space -= length(strip_html_properly(new_text)) @@ -756,29 +761,43 @@ . = ..() scan_target = WEAKREF(set_scan_target) -// -// Fluff Papers -// Fluff papers that you can map in, for lore or whatever. -// -/// Parent item for fluff papers. Used for lore or something I guess -/obj/item/paper/fluff - name = "fluff paper" - desc = "You aren't supposed to see this." - /// The language to translate the paper into. Set to the name of the language. + +/*############################################# + FLUFF PAPERS SUBTYPE +#############################################*/ + +/** + * # Fluff papers + * + * Fluff papers that you can map in, used in mapping + * + * You **have** to create a subtype for the map you're using it in, and have the info/name variables set in code, **not in map** ie: + * + * ``` + * /obj/item/paper/fluff//((/)?)+ + * ``` + * + * This subtype will take care of updating the free space on the paper on initialization, and can be written in different languages + */ +ABSTRACT_TYPE(/obj/item/paper/fluff) + /// The language to translate the paper into, one of the `LANGUAGE_*` in `code\__DEFINES\species_languages.dm` var/language -/obj/item/paper/fluff/Initialize() +/obj/item/paper/fluff/Initialize(mapload, text, title) . = ..() - if(language) - var/datum/language/L = GLOB.all_languages[language] + + if(src.language) + var/datum/language/L = GLOB.all_languages[src.language] if(istype(L) && L.written_style) //Don't want to try and write in Hivenet or something var/key = L.key var/languagetext = "\[lang=[key]]" languagetext += "[info]\[/lang]" - info = parsepencode(languagetext) + src.info = parsepencode(languagetext) update_icon() + update_space(src.info) + // Used in the deck 3 cafe on the SCCV Horizon. /obj/item/paper/fluff/microwave name = "\improper RE: Where are our microwaves?" diff --git a/html/changelogs/fluffyghost-fluffpapertweak.yml b/html/changelogs/fluffyghost-fluffpapertweak.yml new file mode 100644 index 00000000000..ba12863b1d6 --- /dev/null +++ b/html/changelogs/fluffyghost-fluffpapertweak.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Fluff papers now update the free space on the paper correctly on initialization." + - refactor: "Moved all the fluff paper in code, from the maps." + - rscadd: "Added maplinting for fluff papers." + - rscadd: "Added DMDoc for fluff papers." diff --git a/maps/away/ships/freebooter/freebooter_ship_.dm b/maps/away/ships/freebooter/freebooter_ship_.dm index 4999286ca7b..dd2259e30f4 100644 --- a/maps/away/ships/freebooter/freebooter_ship_.dm +++ b/maps/away/ships/freebooter/freebooter_ship_.dm @@ -107,3 +107,7 @@ fuel_consumption = 2 logging_home_tag = "nav_hangar_freebooter" defer_initialisation = TRUE + +/obj/item/paper/fluff/freeboter_ship/captain_note + name = "old captain's note" + info = "Don't forget - all of the crew's clothing is now in the cargo pod!" diff --git a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm index f3ba3e3fe4d..3e0f12d64bc 100644 --- a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm @@ -77,10 +77,7 @@ /area/ship/freebooter_ship/pod2) "avE" = ( /obj/structure/closet/cabinet, -/obj/item/paper{ - name = "old captain's note"; - info = "Don't forget - all of the crew's clothing is now in the cargo pod!" - }, +/obj/item/paper/fluff/freeboter_ship/captain_note, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod1) "awG" = ( @@ -440,10 +437,7 @@ name = "lattice" }, /obj/structure/closet/cabinet, -/obj/item/paper{ - name = "old captain's note"; - info = "Don't forget - all of the crew's clothing is now in the cargo pod!" - }, +/obj/item/paper/fluff/freeboter_ship/captain_note, /turf/simulated/floor, /area/ship/freebooter_ship/pod6) "bxM" = ( @@ -3021,10 +3015,7 @@ name = "lattice" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/paper{ - name = "old captain's note"; - info = "Don't forget - all of the crew's clothing is now in the cargo pod!" - }, +/obj/item/paper/fluff/freeboter_ship/captain_note, /turf/simulated/floor, /area/ship/freebooter_ship/pod1) "qEc" = ( diff --git a/maps/event/idris_cruise/code/idris_cruise.dm b/maps/event/idris_cruise/code/idris_cruise.dm index 0a42a378cd2..50bfadaac29 100644 --- a/maps/event/idris_cruise/code/idris_cruise.dm +++ b/maps/event/idris_cruise/code/idris_cruise.dm @@ -26,3 +26,15 @@ allowed_spawns = list("Living Quarters Lift", "Cryogenic Storage") spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo) default_spawn = "Living Quarters Lift" + +/obj/item/paper/fluff/idris_cruise/vr_prep + name = "VR Introduction Slip" + info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!" + +/obj/item/paper/fluff/idris_cruise/medal_of_valor + name = "medal of valor intro sheet" + info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!" + +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush + name = "Medal of Valor 2 Introduction Slip" + info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!" diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 574a01b813d..dce5759eb5b 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -5681,38 +5681,14 @@ /area/cruise/main_bar/aft) "ezH" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, /obj/structure/sign/securearea{ desc = "A warning sign which declares the door to be one way! Don't get trapped."; name = "\improper ONE WAY DOOR"; @@ -7232,14 +7208,8 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, +/obj/item/paper/fluff/idris_cruise/medal_of_valor, +/obj/item/paper/fluff/idris_cruise/medal_of_valor, /obj/structure/table/standard, /obj/machinery/light/small{ dir = 4 @@ -9396,14 +9366,8 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, +/obj/item/paper/fluff/idris_cruise/medal_of_valor, +/obj/item/paper/fluff/idris_cruise/medal_of_valor, /obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "tiled_preview" @@ -17663,38 +17627,14 @@ /area/cruise/e_supplies) "obv" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, +/obj/item/paper/fluff/idris_cruise/vr_prep, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -25559,66 +25499,21 @@ /area/cruise/aft_p) "uAi" = ( /obj/structure/table/reinforced, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, +/obj/item/paper/fluff/idris_cruise/medal_of_valor_nopush, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" diff --git a/maps/event/rooftop/code/rooftop.dm b/maps/event/rooftop/code/rooftop.dm index 78450800845..d86d5a485ae 100644 --- a/maps/event/rooftop/code/rooftop.dm +++ b/maps/event/rooftop/code/rooftop.dm @@ -25,3 +25,15 @@ map_shuttles = list( /datum/shuttle/autodock/ferry/city ) + +/obj/item/paper/fluff/rooftop/vr_prep + name = "VR Introduction Slip" + info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!" + +/obj/item/paper/fluff/rooftop/medal_of_valor + name = "medal of valor intro sheet" + info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!" + +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush + name = "Medal of Valor 2 Introduction Slip" + info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!" diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 064405fd995..95446fea274 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -670,38 +670,14 @@ /area/city/mendell/interior) "do" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -1400,26 +1376,11 @@ /area/city/mendell) "gZ" = ( /obj/structure/table/stone/marble, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, -/obj/item/paper{ - info = "This stage is for the MEDAL OF VALOR 2 alpha gameplay demo! Please enter your respective team's chair for balance reasons. Do not use the enemy team's base ingame! Remember, sharing is caring!"; - name = "medal of valor intro sheet" - }, +/obj/item/paper/fluff/rooftop/medal_of_valor, +/obj/item/paper/fluff/rooftop/medal_of_valor, +/obj/item/paper/fluff/rooftop/medal_of_valor, +/obj/item/paper/fluff/rooftop/medal_of_valor, +/obj/item/paper/fluff/rooftop/medal_of_valor, /turf/simulated/floor/tiled, /area/city/mendell/interior) "ha" = ( @@ -4039,43 +4000,14 @@ /area/city/mendell) "wR" = ( /obj/structure/table/wood, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/item/paper{ - info = "Welcome to your very own VR preparation room! You can customize your virtual reality avatar here. Once ready, head out to the Game Selection Hall, where you can head out on your customized adventure! Have fun!"; - name = "vr introduction slip" - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which declares the door to be one way! Don't get trapped."; - name = "\improper ONE WAY DOOR"; - pixel_x = 28 - }, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, +/obj/item/paper/fluff/rooftop/vr_prep, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -8464,66 +8396,21 @@ /area/city/mendell/interior) "Wk" = ( /obj/structure/table/reinforced, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, -/obj/item/paper{ - info = "Welcome to MEDAL OF VALOR 2 gameplay demo. You've entered your teams respective base. Proceed to the fighting! Do not push into the enemy's base under any circumstances! Remember, have fun!"; - name = "Medal of Valor 2 Introduction Slip" - }, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, +/obj/item/paper/fluff/rooftop/medal_of_valor_nopush, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" diff --git a/tools/maplint/lints/paper_fluff.yml b/tools/maplint/lints/paper_fluff.yml new file mode 100644 index 00000000000..b95f76bd8be --- /dev/null +++ b/tools/maplint/lints/paper_fluff.yml @@ -0,0 +1,10 @@ +help: "No map made papers, make a subtype in code and write the text there." +=/obj/item/paper/fluff: + banned: true + +#This should be done for all /paper but there's just too much shit +/obj/item/paper/fluff: + banned_variables: + - name + - info + - language