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

Painter Item Refactor (#15828)

Browse Source 
* Modular Painter V1

* Improved Suicide

* Type & Text

Also `item_state` just goes from `icon_state` so it's not needed.

* Modular Painter V2

Big refactor of everything to use datums rather than separate objects.

* Steel airlock stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Vile Heresy

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
SabreML
2021-07-20 15:25:45 +01:00
committed by GitHub
parent aa7f3d882f
commit 150e7e3f60
22 changed files with 342 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/pipes/pipe.dm
+1 -1
View File
@@ -41,7 +41,7 @@
atmosanalyzer_scan(parent.air, user)
return
if(istype(W,/obj/item/pipe_painter))
if(istype(W, /obj/item/painter))
return
return ..()
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -1
View File
@@ -385,7 +385,7 @@
/obj/item/holosign_creator/engineering,
/obj/item/gripper,
/obj/item/matter_decompiler,
/obj/item/floor_painter,
/obj/item/painter,
/obj/item/areaeditor/blueprints/cyborg,
/obj/item/stack/sheet/metal/cyborg,
/obj/item/stack/rods/cyborg,
code/modules/research/designs/autolathe_designs.dm
+4 -29
View File
@@ -178,37 +178,12 @@
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/ears/earmuffs
category = list("initial", "Miscellaneous")
/datum/design/pipe_painter
name = "Pipe Painter"
id = "pipe_painter"
/datum/design/painter
name = "Modular Painter"
id = "mod_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
build_path = /obj/item/pipe_painter
category = list("initial", "Miscellaneous")
/datum/design/window_painter
name = "Window Painter"
id = "window_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
build_path = /obj/item/pipe_painter/window_painter
category = list("initial", "Miscellaneous")
/datum/design/floorpainter
name = "Floor painter"
id = "floor_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 125)
build_path = /obj/item/floor_painter
category = list("initial", "Miscellaneous")
/datum/design/airlock_painter
name = "Airlock painter"
id = "airlock_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 1000)
build_path = /obj/item/airlock_painter
build_path = /obj/item/painter
category = list("initial", "Miscellaneous")
/datum/design/metal