Skip to content

Commit

Permalink
Edits several files
Browse files Browse the repository at this point in the history
  • Loading branch information
thgvr committed Nov 10, 2023
1 parent a8f80e9 commit 2822673
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 10 deletions.
5 changes: 4 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("sauna oven", /obj/structure/sauna_oven, 30, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("sauna oven", /obj/structure/sauna_oven, 15, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden barrel", /obj/structure/fermenting_barrel, 8, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
Expand Down Expand Up @@ -279,6 +279,9 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
. = ..()
. += GLOB.wood_recipes

/obj/item/stack/sheet/mineral/wood/twentyfive
amount = 25

/obj/item/stack/sheet/mineral/wood/fifty
amount = 50

Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/sauna.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define SAUNA_H2O_TEMP T20C + 80
#define SAUNA_H2O_TEMP T20C + 60
#define SAUNA_LOG_FUEL 150
#define SAUNA_MAXIMUM_FUEL 3000
#define SAUNA_WATER_PER_WATER_UNIT 3
Expand Down Expand Up @@ -45,11 +45,11 @@
if(lit)
lit = FALSE
STOP_PROCESSING(SSobj, src)
user.visible_message("<span class='notice'>[user] turns on [src].</span>", "<span class='notice'>You turn on [src].</span>")
user.visible_message("<span class='notice'>[user] turns off [src].</span>", "<span class='notice'>You turn on [src].</span>")
else if (fuel_amount)
lit = TRUE
START_PROCESSING(SSobj, src)
user.visible_message("<span class='notice'>[user] turns off [src].</span>", "<span class='notice'>You turn off [src].</span>")
user.visible_message("<span class='notice'>[user] turns on [src].</span>", "<span class='notice'>You turn off [src].</span>")
update_icon()

/obj/structure/sauna_oven/update_overlays()
Expand Down
15 changes: 14 additions & 1 deletion code/modules/cargo/packs/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,20 @@
Bundles
*/

/datum/supply_pack/civilian/sauna_starter
name = "DIY Sauna Crate"
desc = "A Kalixcian staple. Comes with a set of five freshly cleaned towels, and enough wood to make your very own Sauna. Water not included."
cost = 500
contains = list(/obj/item/stack/sheet/mineral/wood/twentyfive,
/obj/item/reagent_containers/glass/bucket/wooden,
/obj/item/towel,
/obj/item/towel,
/obj/item/towel,
/obj/item/towel,
/obj/item/towel,)
crate_name = "sauna starter crate"
crate_type = /obj/structure/closet/crate/wooden

/datum/supply_pack/civilian/book_crate
name = "Book Crate"
desc = "Surplus from the Nanotrasen Archives, these six books are sure to be good reads."
Expand Down Expand Up @@ -272,7 +286,6 @@
crate_name = "masterwork fishing rod case"
crate_type = /obj/structure/closet/crate/wooden


/datum/supply_pack/civilian/fishinghooks
name = "Fishing Hook Variety Pack"
desc = "A variety of fishing hooks to allow for more specialized fishing."
Expand Down
10 changes: 5 additions & 5 deletions code/modules/cargo/packs/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,24 @@
crate_type = /obj/structure/closet/crate/large

/datum/supply_pack/tools/watertank
name = "Water Tank Crate"
name = "Fresh Water Supply Crate"
desc = "Contains a tank of dihydrogen monoxide. Sounds dangerous."
cost = 600
cost = 500
contains = list(/obj/structure/reagent_dispensers/watertank)
crate_name = "water tank crate"
crate_type = /obj/structure/closet/crate/large

/datum/supply_pack/tools/hightank
name = "Large Water Tank Crate"
name = "Large Fresh Water Supply Crate"
desc = "Contains a high-capacity water tank. Useful for botany or other service jobs."
cost = 1200
cost = 1500
contains = list(/obj/structure/reagent_dispensers/watertank/high)
crate_name = "high-capacity water tank crate"
crate_type = /obj/structure/closet/crate/large

/datum/supply_pack/tools/foamtank
name = "Firefighting Foam Tank Crate"
desc = "Contains a tank of firefighting foam. Also known as \"plasmaman's bane\"."
desc = "Contains a tank of firefighting foam. Also known as \"Phorid's Bane\"."
cost = 1500
contains = list(/obj/structure/reagent_dispensers/foamtank)
crate_name = "foam tank crate"
Expand Down
18 changes: 18 additions & 0 deletions code/modules/clothing/towels.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
if(iscyborg(user))
return

if(in_hands && shape != TOWEL_FOLDED)
. += span_notice("<b>Ctrl-click</b> to fold [src] neatly.")

if(shape == TOWEL_FULL || shape == TOWEL_WAIST)
. += span_notice("<b>Alt-click</b> to adjust the fit of [src].")

Expand Down Expand Up @@ -89,6 +92,21 @@
else
return ..()

/obj/item/towel/CtrlClick(mob/user)
. = ..()

if(. == FALSE)
return
if(shape == TOWEL_FOLDED)
to_chat(user, span_warning("You can't fold a towel that's already folded!"))
var/in_hands = TRUE
if(ishuman(user) && shape == TOWEL_USED)
in_hands = user.get_active_held_item() == src || user.get_inactive_held_item() == src
if(in_hands)
change_towel_shape(user, TOWEL_FOLDED, silent = TRUE)
to_chat(user, span_notice("You fold [src] up neatly."))
return

/obj/item/towel/AltClick(mob/user)
. = ..()

Expand Down

0 comments on commit 2822673

Please sign in to comment.