cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Blacksmithing 2 (#20004)

Browse Source 
* more dorf stuff - Chains, hammers, chainmail

* blacksmithing start

* A little more TLC

* Moves the anvil into the blacksmithing folder. Adds a function to override whether a mob can push an atom/movable (used in anvil)

* Adds pickaxe and hammer heads to iron recipes, and misc item handles to wood recipes

Changes the hammer sprite to something a bit more aesthetically pleasing than my usual noisebombs

* forge time

* more forge stuff

* Removes copypasting

Adds dorfify proc, requiring a /datum/material as its argument.

* Fixes res_amount not working for things that aren't a sheet subtype

* chainmail added
This commit is contained in:
MadmanMartian
2018-11-02 20:07:55 +00:00
committed by jknpj
parent c201d349f0
commit 5d4b43a8d8
31 changed files with 469 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/reagents/reagent_containers.dm
View File

@@ -374,9 +374,8 @@ var/list/LOGGED_SPLASH_REAGENTS = list(FUEL, THERMITE)
..()
attempt_heating(I, user)
/obj/item/weapon/reagent_containers/proc/attempt_heating(obj/item/I, mob/user)
var/temperature = I.is_hot()
var/thermal_energy = I.thermal_energy_transfer()
/obj/item/weapon/reagent_containers/attempt_heating(atom/A, mob/user)
var/temperature = A.is_hot()
if(temperature && reagents)
reagents.heating(thermal_energy, temperature)
to_chat(user, "<span class='notice'>You heat [src] with [I].</span>")
reagents.heating(A.thermal_energy_transfer(), temperature)
to_chat(user, "<span class='notice'>You heat \the [src] with \the [A].</span>")