shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #508 from Citadel-Station-13/upstream-merge-26337

Browse Source 
[MIRROR] Refactors picture frames to use wall frames system
This commit is contained in:
LetterJay
2017-04-25 01:10:40 -05:00
committed by GitHub
parent 5dd5363828 05d8550771
commit a06c6a2994
12 changed files with 75 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/apc_frame.dm
+3 -3
View File
@@ -1,4 +1,5 @@
/obj/item/wallframe
icon = 'icons/obj/wallframe.dmi'
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT*2)
flags = CONDUCT
origin_tech = "materials=1;engineering=1"
@@ -38,7 +39,7 @@
if(inverse)
ndir = turn(ndir, 180)
var/obj/O = new result_path(get_turf(user), ndir, 1)
var/obj/O = new result_path(get_turf(user), ndir, TRUE)
after_attach(O)
qdel(src)
@@ -71,8 +72,7 @@
/obj/item/wallframe/apc
name = "\improper APC frame"
desc = "Used for repairing or building APCs"
icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame"
icon_state = "apc"
result_path = /obj/machinery/power/apc
inverse = 1
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("picture frame", /obj/item/weapon/picture_frame, 1, time = 10),\
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
code/game/objects/structures/extinguisher.dm
+1 -2
View File
@@ -144,6 +144,5 @@
/obj/item/wallframe/extinguisher_cabinet
name = "extinguisher cabinet frame"
desc = "Used for building wall-mounted extinguisher cabinets."
icon = 'icons/obj/apc_repair.dmi'
icon_state = "extinguisher_frame"
icon_state = "extinguisher"
result_path = /obj/structure/extinguisher_cabinet