cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 12:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tanning Tweaks (#7965)

Browse Source 
* Tanning Tweaks

* tanning racks remove from SSobj on destroy
This commit is contained in:
Atermonera
2021-03-29 20:48:11 -09:00
committed by GitHub
parent 10c5e5d4b0
commit 003d47fbbc
6 changed files with 160 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/kitchen/smartfridge.dm
+2 -2
View File
@@ -186,10 +186,10 @@
for(var/obj/item/stack/wetleather/WL in I.instances)
if(!WL.wetness)
if(WL.amount == 1)
if(WL.amount)
WL.forceMove(get_turf(src))
WL.dry()
I.instances -= WL
WL.dry()
break
WL.wetness = max(0, WL.wetness - rand(1, 3))
code/modules/materials/material_recipes.dm
+2
View File
@@ -105,6 +105,7 @@
new/datum/stack_recipe("chest drawer", /obj/structure/filingcabinet/chestdrawer, 4, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), \
))
recipes += new/datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]")
/datum/material/plasteel/generate_recipes()
..()
@@ -162,6 +163,7 @@
recipes += new/datum/stack_recipe("coilgun stock", /obj/item/weapon/coilgun_assembly, 5, pass_stack_color = TRUE, recycle_material = "[name]")
recipes += new/datum/stack_recipe("crude fishing rod", /obj/item/weapon/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]")
recipes += new/datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1, recycle_material = "[name]")
recipes += new/datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]")
/datum/material/wood/log/generate_recipes()
recipes = list()
code/modules/reagents/Chemistry-Holder.dm
+2 -1
View File
@@ -313,7 +313,8 @@
if(spill)
splash(target.loc, spill, multiplier, copy, min_spill, max_spill)
trans_to(target, amount, multiplier, copy)
if(!trans_to(target, amount, multiplier, copy))
touch(target, amount)
/datum/reagents/proc/trans_type_to(var/target, var/rtype, var/amount = 1)
if (!target)