Updates Rocky Motel (#28786)

* this motel rocks

* nvm i got chat gpt

* relocate icon

* oh it removed web commit
This commit is contained in:
kyunkyunkyun
2025-04-09 19:26:42 +00:00
committed by GitHub
parent 394a1fed34
commit bf28bfd604
18 changed files with 2250 additions and 1874 deletions
File diff suppressed because it is too large Load Diff
@@ -2,12 +2,12 @@
{
// Submap of Rocky Motel with a pod crashed into it
"type": "SubmapExtractInsert",
"submap_size_x": 13,
"submap_size_y": 10,
"submap_size_x": 14,
"submap_size_y": 15,
"submap_size_z": 1,
"submaps_dmm": "submaps/rocky_motel_submap.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/rocky_motel/drunk_accident",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/rocky_motel/drunk_accident",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/rocky_motel",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/rocky_motel",
"submaps_can_repeat": true // doesn't matter, as there's only one insert marker
}
]
File diff suppressed because it is too large Load Diff
+8 -2
View File
@@ -16,7 +16,6 @@
name = "\improper Abandoned Teleporter"
icon_state = "teleporter"
ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/signal.ogg')
there_can_be_many = TRUE
/area/ruin/space/unpowered/no_grav/way_home
name = "\improper Salvation"
@@ -72,7 +71,6 @@
/area/ruin/space/methlab
name = "\improper Abandoned Drug Lab"
icon_state = "green"
there_can_be_many = TRUE
// Space Bar
/area/ruin/space/powered/bar
@@ -294,3 +292,11 @@
there_can_be_many = FALSE
requires_power = FALSE
ambientsounds = list("sound/ambience/reebe_ambience_1.ogg", "sound/ambience/reebe_ambience_2.ogg", "sound/ambience/reebe_ambience_3.ogg")
/area/ruin/space/rocky_motel
name = "\improper Rocky Motel"
icon_state = "rocky_motel"
there_can_be_many = FALSE
/area/ruin/space/rocky_motel/asteroid
icon_state = "away"
+6
View File
@@ -109,6 +109,8 @@
/obj/machinery/light_switch/proc/set_area_lightswitch(new_state)
var/area/A = get_area(src)
if(A.lightswitch == new_state)
return
A.lightswitch = new_state
// Sends an area signal to all lightswitches in our area to update their icons and overlays
A.update_icon(UPDATE_ICON_STATE)
@@ -119,3 +121,7 @@
/obj/machinery/light_switch/proc/lightswitch_cancel_autoswitch()
SIGNAL_HANDLER // COMSIG_AREA_LIGHTSWITCH_DELETING
return COMSIG_AREA_LIGHTSWITCH_CANCEL
/obj/machinery/light_switch/off/Initialize(mapload, build_dir)
. = ..()
set_area_lightswitch(FALSE)
+5
View File
@@ -237,6 +237,11 @@
/obj/machinery/suit_storage_unit/syndicate/secure
secure = TRUE
/obj/machinery/suit_storage_unit/syndicate/empty
mask_type = null
suit_type = null
state_open = TRUE
/obj/machinery/suit_storage_unit/radsuit
name = "radiation suit storage unit"
suit_type = /obj/item/clothing/suit/radiation
@@ -58,8 +58,8 @@
/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/dvorak/turret_room
name = "DVORAK turret room"
/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/rocky_motel/drunk_accident
name = "Drunken Wreck"
/obj/effect/map_effect/marker/mapmanip/submap/insert/space_ruin/rocky_motel
name = "Rocky motel submap"
/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/rocky_motel/drunk_accident
name = "Drunken Wreck"
/obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/rocky_motel
name = "Rocky motel submap"
@@ -127,3 +127,10 @@
/obj/effect/spawner/random/loot_crate/rarely
name = "lootcrate spawner, 20% chance"
spawn_loot_chance = 20
/obj/effect/spawner/random/loot/bluespace_tap/food_mixed
loot = list(
/obj/effect/spawner/random/bluespace_tap/food_common = 6,
/obj/effect/spawner/random/bluespace_tap/food_uncommon = 3,
/obj/effect/spawner/random/bluespace_tap/food_rare,
)
@@ -192,3 +192,9 @@
/mob/living/simple_animal/hostile/pirate,
/mob/living/simple_animal/hostile/pirate/ranged,
)
/obj/effect/spawner/random/fancy_table
name = "fancy table spawner"
icon = 'icons/effects/random_spawners.dmi'
icon_state = "fancy_table"
loot_type_path = /obj/structure/table/wood/fancy
@@ -1352,6 +1352,15 @@
new /obj/item/screwdriver(src)
new /obj/item/paper/autochef_quickstart(src)
/obj/item/storage/box/kitchen_utensils/populate_contents()
new /obj/item/kitchen/utensil/fork(src)
new /obj/item/kitchen/utensil/fork(src)
new /obj/item/kitchen/utensil/spoon(src)
new /obj/item/kitchen/utensil/spoon(src)
new /obj/item/kitchen/knife(src)
new /obj/item/kitchen/knife/cheese(src)
new /obj/item/kitchen/knife/pizza_cutter(src)
#undef NODESIGN
#undef NANOTRASEN
#undef SYNDI
@@ -67,6 +67,15 @@
req_access = null
locked = FALSE
/obj/structure/closet/secure_closet/freezer/fridge/mixed/populate_contents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/condiment/milk(src)
new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
for(var/i in 1 to 4)
new /obj/item/food/meat/monkey(src)
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
icon_state = "freezer"
@@ -131,3 +131,10 @@
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/capacitor = 1,
)
/obj/machinery/cooking/deepfryer/loaded/Initialize(mapload)
. = ..()
for(var/i in 1 to length(surfaces))
var/datum/cooking_surface/surface = surfaces[i]
surface.container = new /obj/item/reagent_containers/cooking/deep_basket(src)
update_appearance()
+8
View File
@@ -200,3 +200,11 @@
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/matter_bin = 2,
)
/obj/machinery/cooking/grill/loaded/Initialize(mapload)
. = ..()
for(var/i in 1 to length(surfaces))
var/datum/cooking_surface/surface = surfaces[i]
surface.container = new /obj/item/reagent_containers/cooking/grill_grate(src)
stored_wood = 30
update_appearance()
+7
View File
@@ -164,3 +164,10 @@
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/micro_laser = 2,
)
/obj/machinery/cooking/oven/loaded/Initialize(mapload)
. = ..()
for(var/i in 1 to length(surfaces))
var/datum/cooking_surface/surface = surfaces[i]
surface.container = new /obj/item/reagent_containers/cooking/oven(src)
update_appearance()
+10
View File
@@ -131,3 +131,13 @@
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/capacitor = 1,
)
/obj/machinery/cooking/stovetop/loaded/Initialize(mapload)
. = ..()
for(var/i in 1 to length(surfaces))
var/datum/cooking_surface/surface = surfaces[i]
if(i % 2 == 0)
surface.container = new /obj/item/reagent_containers/cooking/pot(src)
else
surface.container = new /obj/item/reagent_containers/cooking/pan(src)
update_appearance()
+7
View File
@@ -1069,3 +1069,10 @@
/obj/item/paper/instruction/pacman_generator
name = "Instructions for P.A.C.M.A.N. Generator series"
info = "P.A.C.M.A.N. are commonly used as 'Emergency' power generators, with its upgraded version being capable of utilizing uranium and plasma sheets to function. Simply anchor on the power cable node, insert the plasma sheet, select the level and turn it ON to generate power, just make sure to not overheat it or it will explode."
/obj/item/paper/rocky_motel
name = "strange note"
info = "Nancy, dear, could you <i>please</i> stop hiding my beer in the safe? I'm telling you, it's alcohol-free and safe to drink. Just quit making me mad, for fuck's sake!"
/obj/item/paper/rocky_motel/syndie
info = "Don't forget to grab the gold from safe tomorrow, I'm not going to stay there for another year, this place sucks."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 34 KiB