cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[semi-modular] reagent forging (#6614)

Browse Source 
* start of reagent forging

* reagent forging

* add the three items to ashwalker den
This commit is contained in:
jjpark-kb
2021-06-30 23:36:12 +01:00
committed by GitHub
parent fcbe57e4be
commit ffa39629ed
20 changed files with 707 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+10
View File
@@ -74,6 +74,16 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
R.use(2)
if (!R && replace)
user.put_in_hands(new_item)
// SKYRAT EDIT ADDITION BEGIN: Reagent Forging
if(istype(W, /obj/item/forging/tongs))
var/obj/searchObj = locate(/obj) in W.contents
if(searchObj)
to_chat(user, span_warning("The tongs are already holding something, make room."))
return
forceMove(W)
W.icon_state = "tong_full"
return
// SKYRAT EDIT ADDITION END
else
return ..()
code/game/objects/items/stacks/sheets/sheet_types.dm
+5 -1
View File
@@ -124,7 +124,10 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 5 SECONDS), \
new/datum/stack_recipe("shower frame", /obj/structure/showerframe, 2, time= 2 SECONDS)
new/datum/stack_recipe("shower frame", /obj/structure/showerframe, 2, time= 2 SECONDS), \
null, \
new/datum/stack_recipe("anvil", /obj/structure/reagent_anvil, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("forge", /obj/structure/reagent_forge, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE)
))
/obj/item/stack/sheet/iron//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
@@ -245,6 +248,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("water basin", /obj/structure/reagent_water_basin, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE), /* SKYRAT EDIT ADDITION*/\
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100), \
null, \