cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1044 from Nalarac/master

Browse Source 
Adds welding goggles to autolathes.
This commit is contained in:
Neerti
2016-02-21 04:57:55 -05:00
parent c0ad435650 e86ed849a9
commit d85b8f95f6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/autolathe_datums.dm
View File

@@ -311,6 +311,11 @@
path = /obj/item/weapon/camera_assembly path = /obj/item/weapon/camera_assembly
category = "Engineering" category = "Engineering"
/datum/autolathe/recipe/weldinggoggles
name = "welding goggles"
path = /obj/item/clothing/glasses/welding
category = "General"
/datum/autolathe/recipe/flamethrower /datum/autolathe/recipe/flamethrower
name = "flamethrower" name = "flamethrower"
path = /obj/item/weapon/flamethrower/full path = /obj/item/weapon/flamethrower/full
@@ -423,4 +428,4 @@
name = "knuckle dusters" name = "knuckle dusters"
path = /obj/item/weapon/material/knuckledusters path = /obj/item/weapon/material/knuckledusters
hidden = 1 hidden = 1
category = "Arms and Ammunition" category = "Arms and Ammunition"

1
code/modules/clothing/glasses/glasses.dm
View File

@@ -184,6 +184,7 @@ BLIND // can't see anything
icon_state = "welding-g" icon_state = "welding-g"
item_state = "welding-g" item_state = "welding-g"
action_button_name = "Flip Welding Goggles" action_button_name = "Flip Welding Goggles"
matter = list(DEFAULT_WALL_MATERIAL = 1500, "glass" = 1000)
var/up = 0 var/up = 0
/obj/item/clothing/glasses/welding/attack_self() /obj/item/clothing/glasses/welding/attack_self()