Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes req being able to sell trashcarts for $$$$ #6460

Closed
wants to merge 2 commits into from
Closed

fixes req being able to sell trashcarts for $$$$ #6460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f793481
fixes trash cart giving req points
Jun 13, 2024
c24c383
subtypes woodencrate
Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand Down
12 changes: 0 additions & 12 deletions code/game/objects/structures/crates_lockers/closets/coffin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions code/game/objects/structures/crates_lockers/crates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
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(
"Plain" = /obj/structure/closet/crate,
Expand Down Expand Up @@ -340,6 +342,15 @@
icon_state = "closed_trashcart"
icon_opened = "open_trashcart"
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"
Expand Down
2 changes: 2 additions & 0 deletions code/game/supplyshuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,8 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())

// Sell crates.
for(var/obj/structure/closet/crate/C in area_shuttle)
if(!C.can_sell)
continue
points += points_per_crate
qdel(C)

Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/BigRed/BigRed.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/lazy_templates/clf_ert_station.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/templates/lazy_templates/twe_ert_station.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
},
Expand Down
Loading