From 72f69e2e1522f9eea4bfb10ce70acb7fef1a4bc0 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 6 Jun 2021 02:30:22 +0200 Subject: [PATCH] [MIRROR] Standardize beach ball descriptions and branding (#6151) * Standardize beach ball descriptions and branding (#59499) - All beach balls are now Nanotrasen-brand beach balls, including the ones that are ordered from Cargo. - `wilson`, a beach ball in a cave, now has a proper name, despite their lack of capitalisation. * Standardize beach ball descriptions and branding * Mirror! Co-authored-by: coiax Co-authored-by: Funce --- _maps/RandomZLevels/caves.dmm | 4 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 8 ++------ _maps/map_files/MetaStation/MetaStation_skyrat.dmm | 8 ++------ code/game/objects/items/toys.dm | 6 +++++- code/modules/cargo/goodies.dm | 9 +++++++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 369a1c16cd2..4cc5306c03c 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -1628,8 +1628,8 @@ /area/awaymission/caves/bmp_asteroid) "gd" = ( /obj/item/toy/beach_ball{ - desc = "Its a beachball with a face crudely drawn onto it with some soot."; - name = "wilson" + name = "\proper wilson"; + desc = "It's a beachball with a face crudely drawn onto it with some soot." }, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14;TEMP=2.7" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ee40888e8d9..04eade796ad 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -48314,9 +48314,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "nLZ" = ( -/obj/item/toy/beach_ball{ - name = "Nanotrasen-branded beach ball" - }, +/obj/item/toy/beach_ball/branded, /turf/open/space/basic, /area/space) "nMa" = ( @@ -59622,9 +59620,7 @@ }, /area/maintenance/starboard/fore) "rxh" = ( -/obj/item/toy/beach_ball{ - desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"; - name = "\improper Nanotrasen-brand beach ball"; +/obj/item/toy/beach_ball/branded{ pixel_y = 7 }, /obj/structure/table/wood, diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index b905692da0e..58ba9a6708c 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -63912,9 +63912,7 @@ /turf/open/floor/iron/dark, /area/security/prison) "rxh" = ( -/obj/item/toy/beach_ball{ - desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"; - name = "\improper Nanotrasen-brand beach ball"; +/obj/item/toy/beach_ball/branded{ pixel_y = 7 }, /obj/structure/table/wood, @@ -69269,9 +69267,7 @@ /turf/open/floor/wood, /area/security/prison) "tzV" = ( -/obj/item/toy/beach_ball{ - name = "Nanotrasen-branded beach ball" - }, +/obj/item/toy/beach_ball/branded, /turf/open/space/basic, /area/space) "tAg" = ( diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index d110e88dc9b..8ed9758b4ed 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1153,12 +1153,16 @@ * Beach ball */ /obj/item/toy/beach_ball + name = "beach ball" icon = 'icons/misc/beach.dmi' icon_state = "ball" - name = "beach ball" inhand_icon_state = "beachball" w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets +/obj/item/toy/beach_ball/branded + name = "\improper Nanotrasen-brand beach ball" + desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen" + /* * Clockwork Watch */ diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index e3447e7e222..dee19bf0930 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -141,9 +141,14 @@ /datum/supply_pack/goody/beach_ball name = "Beach Ball" - desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen" + // uses desc from item cost = PAYCHECK_MEDIUM - contains = list(/obj/item/toy/beach_ball) + contains = list(/obj/item/toy/beach_ball/branded) + +/datum/supply_pack/goody/beach_ball/New() + ..() + var/obj/item/toy/beach_ball/branded/beachball_type = /obj/item/toy/beach_ball/branded + desc = initial(beachball_type.desc) /datum/supply_pack/goody/medipen_twopak name = "Medipen Two-Pak"