subtypes woodencrate

cmss13-devs · Jun 14, 2024 · c24c383 · c24c383
1 parent f793481
commit c24c383
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_INIT_TYPED(wood_recipes, /datum/stack_recipe, list ( \
 	new/datum/stack_recipe("campfire", /obj/structure/prop/brazier/frame/full/campfire, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = TRUE), \
 	new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 1, time = 10, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 20, one_per_turf = ONE_TYPE_PER_BORDER, on_floor = 1), \
-	new/datum/stack_recipe("wooden crate", /obj/structure/closet/coffin/woodencrate, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
+	new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/woodencrate, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = ONE_TYPE_PER_TURF, on_floor = 1), \
 	new/datum/stack_recipe("baseball bat", /obj/item/weapon/baseballbat, 10, time = 20, on_floor = 1), \

diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -30,15 +30,3 @@
 
 	open_sound = 'sound/effects/stonedoor_openclose.ogg'
 	close_sound = 'sound/effects/stonedoor_openclose.ogg'
-
-
-/obj/structure/closet/coffin/woodencrate //Subtyped here so Req doesn't sell them
-	name = "wooden crate"
-	desc = "A wooden crate. Shoddily assembled, spacious and worthless on the ASRS"
-	icon_state = "closed_woodcrate"
-	icon_opened = "open_woodcrate"
-	icon_closed = "closed_woodcrate"
-	material = MATERIAL_WOOD
-	store_mobs = FALSE
-	climbable = TRUE
-	throwpass = 1
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
@@ -12,6 +12,7 @@
 	throwpass = 1 //prevents moving crates by hurling things at them
 	store_mobs = FALSE
 	var/rigged = 0
+	// whether or not it's sellable for req points
 	var/can_sell = TRUE
 	/// Types this crate can be made into
 	var/list/crate_customizing_types = list(
@@ -343,6 +344,14 @@
 	icon_closed = "closed_trashcart"
 	can_sell = FALSE
 
+/obj/structure/closet/crate/woodencrate
+	name = "wooden crate"
+	desc = "A wooden crate. Shoddily assembled, spacious and worthless on the ASRS"
+	icon_state = "closed_woodcrate"
+	icon_opened = "open_woodcrate"
+	icon_closed = "closed_woodcrate"
+	can_sell = FALSE
+
 /obj/structure/closet/crate/weapon
 	name = "weapons crate"
 	desc = "A weapons crate."

diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
@@ -38314,7 +38314,7 @@
 	},
 /area/bigredv2/outside/admin_building)
 "taV" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor{
 	dir = 1;

diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -9043,7 +9043,7 @@
 	},
 /area/lv522/atmos/east_reactor)
 "efT" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/item/clothing/mask/cigarette/weed,
 /obj/item/clothing/mask/cigarette/weed,
 /obj/item/clothing/mask/cigarette/weed,

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -42432,7 +42432,7 @@
 	},
 /area/almayer/engineering/laundry)
 "kxL" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/structure/largecrate/random/mini/wooden{
 	pixel_x = 4;
 	pixel_y = 6
@@ -70295,7 +70295,7 @@
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
 "tXj" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/item/storage/box/m94,
 /obj/item/storage/box/m94,
 /obj/item/storage/box/m94,
@@ -81371,7 +81371,7 @@
 /turf/open/floor/almayer,
 /area/almayer/engineering/laundry)
 "xCa" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/item/frame/table/wood/poor,
 /obj/item/frame/table/wood/poor,
 /turf/open/floor/almayer{

diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm
@@ -912,7 +912,7 @@
 /obj/structure/platform/kutjevo{
 	dir = 1
 	},
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /turf/open/auto_turf/strata_grass/layer1,
 /area/adminlevel/ert_station/clf_station)
 "uO" = (

diff --git a/maps/templates/lazy_templates/twe_ert_station.dmm b/maps/templates/lazy_templates/twe_ert_station.dmm
@@ -141,7 +141,7 @@
 	},
 /area/adminlevel/ert_station/royal_marines_station)
 "dm" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/light{
 	dir = 8
@@ -769,7 +769,7 @@
 	},
 /area/adminlevel/ert_station/royal_marines_station)
 "nW" = (
-/obj/structure/closet/coffin/woodencrate,
+/obj/structure/closet/crate/woodencrate,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},