mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Merge branch 'master' into upstream-merge-11110
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
desc = "It's a basic storage unit."
|
||||
icon = 'icons/obj/closets/bases/closet.dmi'
|
||||
icon_state = "base"
|
||||
density = 1
|
||||
density = TRUE
|
||||
w_class = ITEMSIZE_HUGE
|
||||
layer = UNDER_JUNK_LAYER
|
||||
blocks_emissive = EMISSIVE_BLOCK_GENERIC
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
icon_state = "closed_unlocked"
|
||||
seal_tool = null
|
||||
breakout_sound = 'sound/weapons/thudswoosh.ogg'
|
||||
anchored = 1
|
||||
anchored = TRUE
|
||||
max_closets = 1
|
||||
opened = 1
|
||||
closet_appearance = null // Special icon for us
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "It's an egg; it's smooth to the touch." //This is the default egg.
|
||||
icon = 'icons/obj/egg_vr.dmi'
|
||||
icon_state = "egg"
|
||||
density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
|
||||
density = FALSE //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
|
||||
var/icon_closed = "egg"
|
||||
var/icon_opened = "egg_open"
|
||||
var/icon_locked = "egg"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
name = "administrative supply closet"
|
||||
desc = "It's a storage unit for things that have no right being here."
|
||||
closet_appearance = /decl/closet_appearance/tactical
|
||||
anchored = 0
|
||||
anchored = FALSE
|
||||
|
||||
/obj/structure/closet/gimmick/russian
|
||||
name = "russian surplus closet"
|
||||
@@ -44,7 +44,7 @@
|
||||
name = "\improper Thunderdome closet"
|
||||
desc = "Everything you need!"
|
||||
closet_appearance = /decl/closet_appearance/thunderdomered
|
||||
anchored = 1
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/closet/thunderdome/tdred
|
||||
name = "red-team Thunderdome closet"
|
||||
|
||||
@@ -220,8 +220,8 @@
|
||||
desc = "It's wall-mounted storage unit for an AutoLok suit."
|
||||
icon = 'icons/obj/closets/bases/wall_double.dmi'
|
||||
closet_appearance = /decl/closet_appearance/wall_double/autolok
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
wall_mounted = 1
|
||||
store_mobs = 0
|
||||
|
||||
@@ -236,8 +236,8 @@
|
||||
desc = "It's wall-mounted storage unit for an emergency suit."
|
||||
icon = 'icons/obj/closets/bases/wall.dmi'
|
||||
closet_appearance = /decl/closet_appearance/wall/emergency
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
wall_mounted = 1
|
||||
store_mobs = 0
|
||||
|
||||
|
||||
@@ -225,8 +225,8 @@
|
||||
desc = "It's a secure wall-mounted storage unit for first aid supplies."
|
||||
plane = TURF_PLANE
|
||||
layer = ABOVE_TURF_LAYER
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
wall_mounted = 1
|
||||
store_mobs = 0
|
||||
req_access = list(access_medical_equip)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "It's an immobile card-locked storage unit."
|
||||
icon = 'icons/obj/closet.dmi'
|
||||
icon_state = "secure1"
|
||||
density = 1
|
||||
density = TRUE
|
||||
opened = 0
|
||||
var/locked = 1
|
||||
var/broken = 0
|
||||
|
||||
@@ -271,7 +271,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
|
||||
name = "brig locker"
|
||||
req_access = list(access_brig)
|
||||
closet_appearance = /decl/closet_appearance/secure_closet/brig
|
||||
anchored = 1
|
||||
anchored = TRUE
|
||||
var/id = null
|
||||
|
||||
starts_with = list(
|
||||
@@ -281,7 +281,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
|
||||
/obj/structure/closet/secure_closet/posters
|
||||
name = "morale storage"
|
||||
req_access = list(access_security)
|
||||
anchored = 1
|
||||
anchored = TRUE
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/poster/nanotrasen,
|
||||
@@ -308,7 +308,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
|
||||
name = "wall locker"
|
||||
req_access = list(access_security)
|
||||
closet_appearance = /decl/closet_appearance/wall
|
||||
density = 1
|
||||
density = TRUE
|
||||
|
||||
//too small to put a man in
|
||||
large = 0
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
desc = "An incredibly lifelike marble carving"
|
||||
icon = 'icons/obj/statue.dmi'
|
||||
icon_state = "human_male"
|
||||
density = 1
|
||||
anchored = 1
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
health = 0 //destroying the statue kills the mob within
|
||||
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
|
||||
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
|
||||
|
||||
@@ -187,8 +187,8 @@
|
||||
closet_appearance = /decl/closet_appearance/wall/hydrant
|
||||
plane = TURF_PLANE
|
||||
layer = ABOVE_TURF_LAYER
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
wall_mounted = 1
|
||||
store_mobs = 0
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
name = "first-aid closet"
|
||||
desc = "It's wall-mounted storage unit for first aid supplies."
|
||||
closet_appearance = /decl/closet_appearance/wall/medical
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
wall_mounted = 1
|
||||
store_mobs = 0
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
name = "Wall Locker"
|
||||
icon = 'icons/obj/closets/bases/wall.dmi'
|
||||
closet_appearance = /decl/closet_appearance/wall
|
||||
density = 0
|
||||
anchored = 1
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
store_mobs = 0
|
||||
wall_mounted = 1
|
||||
|
||||
@@ -85,8 +85,8 @@
|
||||
name = "Wall Cabinet"
|
||||
icon = 'icons/obj/closets/bases/wall_double.dmi'
|
||||
closet_appearance = /decl/closet_appearance/wall_double
|
||||
density = 0
|
||||
anchored = 1
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
store_mobs = 0
|
||||
wall_mounted = 1
|
||||
plane = TURF_PLANE
|
||||
@@ -113,8 +113,8 @@
|
||||
name = "Kitchen Cabinet"
|
||||
icon = 'icons/obj/closets/bases/wall_double.dmi'
|
||||
closet_appearance = /decl/closet_appearance/wall_double/kitchen
|
||||
density = 0
|
||||
anchored = 1
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/closet/walllocker_double/kitchen/north
|
||||
pixel_y = 32
|
||||
@@ -157,8 +157,8 @@
|
||||
name = "fire-safety closet"
|
||||
desc = "It's a storage cabinet packed with fire-fighting supplies."
|
||||
closet_appearance = /decl/closet_appearance/wall_double/fire_safety
|
||||
anchored = 1
|
||||
density = 0
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/clothing/suit/fire/firefighter,
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
desc = "A rectangular steel crate."
|
||||
icon = 'icons/obj/closets/bases/crate.dmi'
|
||||
closet_appearance = /decl/closet_appearance/crate
|
||||
climbable = 1
|
||||
climbable = TRUE
|
||||
dir = 4 //Spawn facing 'forward' by default.
|
||||
var/points_per_crate = 5
|
||||
var/rigged = 0
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "A hefty wooden crate."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "densecrate"
|
||||
density = 1
|
||||
density = TRUE
|
||||
var/list/starts_with
|
||||
|
||||
/obj/structure/largecrate/Initialize()
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "A large metal lattice that seems to exist solely to annoy consumers."
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "vehicle_cage"
|
||||
density = 1
|
||||
density = TRUE
|
||||
var/obj/vehicle/my_vehicle
|
||||
var/my_vehicle_type
|
||||
var/paint_color = "#666666"
|
||||
|
||||
Reference in New Issue
Block a user