mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
This commit is contained in:
@@ -9,4 +9,17 @@
|
||||
/obj/effect/turf_decal/weather/snow/corner
|
||||
name = "snow corner piece"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
icon_state = "snow_corner"
|
||||
icon_state = "snow_corner"
|
||||
|
||||
/obj/effect/turf_decal/weather/dirt
|
||||
name = "dirt siding"
|
||||
icon = 'icons/turf/decals.dmi'
|
||||
icon_state = "dirt_side"
|
||||
|
||||
/obj/effect/turf_decal/weather/sand
|
||||
name = "sand siding"
|
||||
icon = 'icons/misc/beach.dmi'
|
||||
icon_state = "sand_side"
|
||||
|
||||
/obj/effect/turf_decal/weather/sand/light
|
||||
icon_state = "lightsand_side"
|
||||
|
||||
@@ -1517,3 +1517,18 @@
|
||||
|
||||
/obj/item/toy/dummy/GetVoice()
|
||||
return doll_name
|
||||
|
||||
/obj/item/toy/seashell
|
||||
name = "seashell"
|
||||
desc = "May you always have a shell in your pocket and sand in your shoes. Whatever that's supposed to mean."
|
||||
icon = 'icons/misc/beach.dmi'
|
||||
icon_state = "shell1"
|
||||
var/static/list/possible_colors = list("" = 2, COLOR_PURPLE_GRAY = 1, COLOR_OLIVE = 1, COLOR_PALE_BLUE_GRAY = 1, COLOR_RED_GRAY = 1)
|
||||
|
||||
/obj/item/toy/seashell/Initialize()
|
||||
. = ..()
|
||||
pixel_x = rand(-5, 5)
|
||||
pixel_y = rand(-5, 5)
|
||||
icon_state = "shell[rand(1,3)]"
|
||||
color = pickweight(possible_colors)
|
||||
setDir(pick(GLOB.cardinals))
|
||||
|
||||
@@ -61,6 +61,11 @@
|
||||
..()
|
||||
for(var/i = 0, i < 4, i++)
|
||||
new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/meat/open
|
||||
req_access = null
|
||||
locked = FALSE
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/fridge
|
||||
name = "refrigerator"
|
||||
|
||||
@@ -73,6 +78,10 @@
|
||||
for(var/i = 0, i < 2, i++)
|
||||
new /obj/item/storage/fancy/egg_box(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/fridge/open
|
||||
req_access = null
|
||||
locked = FALSE
|
||||
|
||||
/obj/structure/closet/secure_closet/freezer/money
|
||||
name = "freezer"
|
||||
desc = "This contains cold hard cash."
|
||||
|
||||
@@ -182,3 +182,59 @@
|
||||
icon_state = "snowlegion"
|
||||
anchored = TRUE
|
||||
deconstructible = FALSE
|
||||
|
||||
/obj/structure/fluff/big_chain
|
||||
name = "giant chain"
|
||||
desc = "A towering link of chains leading up to the ceiling."
|
||||
icon = 'icons/effects/32x96.dmi'
|
||||
icon_state = "chain"
|
||||
layer = ABOVE_OBJ_LAYER
|
||||
anchored = TRUE
|
||||
density = TRUE
|
||||
deconstructible = FALSE
|
||||
|
||||
/obj/structure/fluff/railing
|
||||
name = "railing"
|
||||
desc = "Basic railing meant to protect idiots like you from falling."
|
||||
icon = 'icons/obj/fluff.dmi'
|
||||
icon_state = "railing"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
deconstructible = FALSE
|
||||
|
||||
/obj/structure/fluff/railing/corner
|
||||
icon_state = "railing_corner"
|
||||
density = FALSE
|
||||
|
||||
/obj/structure/fluff/beach_towel
|
||||
name = "beach towel"
|
||||
desc = "A towel decorated in various beach-themed designs."
|
||||
icon = 'icons/obj/fluff.dmi'
|
||||
icon_state = "railing"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
deconstructible = FALSE
|
||||
|
||||
/obj/structure/fluff/beach_umbrella
|
||||
name = "beach umbrella"
|
||||
desc = "A fancy umbrella designed to keep the sun off beach-goers."
|
||||
icon = 'icons/obj/fluff.dmi'
|
||||
icon_state = "brella"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
deconstructible = FALSE
|
||||
|
||||
/obj/structure/fluff/beach_umbrella/security
|
||||
icon_state = "hos_brella"
|
||||
|
||||
/obj/structure/fluff/beach_umbrella/science
|
||||
icon_state = "rd_brella"
|
||||
|
||||
/obj/structure/fluff/beach_umbrella/engine
|
||||
icon_state = "ce_brella"
|
||||
|
||||
/obj/structure/fluff/beach_umbrella/cap
|
||||
icon_state = "cap_brella"
|
||||
|
||||
/obj/structure/fluff/beach_umbrella/syndi
|
||||
icon_state = "syndi_brella"
|
||||
|
||||
Reference in New Issue
Block a user