cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Standardize beach ball descriptions and branding (#6151)

Browse Source 
* 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 <yellowbounder@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2021-06-06 12:30:22 +12:00
committed by GitHub
co-authored by coiax Funce
parent 53a4b4beb8
commit 72f69e2e15
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/caves.dmm
+2 -2
View File
@@ -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"
_maps/map_files/MetaStation/MetaStation.dmm
+2 -6
View File
@@ -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,
_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+2 -6
View File
@@ -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" = (
code/game/objects/items/toys.dm
+5 -1
View File
@@ -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
*/
code/modules/cargo/goodies.dm
+7 -2
View File
@@ -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"