cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9527 from Ty-Omaha/muh-art

Browse Source 
Fixes half the server crashing, removes canvases
This commit is contained in:
variableundefined
2018-09-29 07:49:30 +08:00
committed by GitHub
parent 7fd6f669c8 c101ebd302
commit 68c35ccced
6 changed files with 0 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/frames.dm
-2
View File
@@ -35,8 +35,6 @@
icon_state = "[icon_base]-photo"
else if(istype(displayed, /obj/structure/sign/poster))
icon_state = "[icon_base]-[(displayed.icon_state in wide_posters) ? "wposter" : "poster"]"
else if(istype(displayed, /obj/item/canvas))
icon_state = "[icon_base]-canvas-[displayed.icon_state]"
else
icon_state = "[icon_base]-paper"
code/modules/research/designs/autolathe_designs.dm
-32
View File
@@ -856,38 +856,6 @@
build_path = /obj/item/videocam
category = list("initial", "Miscellaneous")
/datum/design/canvas
name = "11px by 11px Canvas"
id = "canvas"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50)
build_path = /obj/item/canvas
category = list("initial", "Miscellaneous")
/datum/design/canvas/nineteenXnineteen
name = "19px by 19px Canvas"
id = "canvas19x19"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50)
build_path = /obj/item/canvas/nineteenXnineteen
category = list("initial", "Miscellaneous")
/datum/design/canvas/twentythreeXnineteen
name = "23px by 19px Canvas"
id = "canvas23x19"
build_type = AUTOLATHE
materials = list(MAT_METAL = 70)
build_path = /obj/item/canvas/twentythreeXnineteen
category = list("initial", "Miscellaneous")
/datum/design/canvas/twentythreeXtwentythree
name = "23px by 23px Canvas"
id = "canvas23x23"
build_type = AUTOLATHE
materials = list(MAT_METAL = 100)
build_path = /obj/item/canvas/twentythreeXtwentythree
category = list("initial", "Miscellaneous")
/datum/design/logic_board
name = "Logic Circuit"
id = "logic_board"