cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Newscasters/camera monitors/displays tweaks (#19305)

Browse Source 
* frames and autolathe

* final adjustment

* engine monitor

* circuit board selection and newscaster tweaks

* names adjustments

* entertainment frame icon adjustment

* moving to another PR

* forgot to move those

* added the other monitors circuit boards

* Update code/game/machinery/computer/camera.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* removed unnecessary flow

* display

* entertainment frame uses correct icon now

* merge conflcit part 2, do_build for newscasters

* moving var

* Sirryan suggestion and reverting piece of code removed by mistake

* Update code/game/machinery/computer/buildandrepair.dm

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

* added description

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Sirryan suggestion and removed 1

* moved to on_deconstruction

* Removing unused arguments

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Henri215
2022-10-28 19:00:03 +02:00
committed by GitHub
co-authored by Farie82 SteelSlayer Sirryan2002
parent bdf50f11d8
commit 47b3d08f04
8 changed files with 119 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone_items.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/item/mounted/frame/apc_frame,
/obj/item/mounted/frame/alarm_frame,
/obj/item/mounted/frame/firealarm,
/obj/item/mounted/frame/newscaster_frame,
/obj/item/mounted/frame/display/newscaster_frame,
/obj/item/mounted/frame/intercom,
/obj/item/mounted/frame/extinguisher,
/obj/item/mounted/frame/light_switch,
code/modules/newscaster/obj/newscaster.dm
+2 -2
View File
@@ -137,7 +137,7 @@
if(!I.tool_use_check(user, 0))
return
to_chat(user, "<span class='notice'>Now [anchored ? "un" : ""]securing [name]</span>")
if(!I.use_tool(src, user, 60, volume = I.tool_volume))
if(!I.use_tool(src, user, 2 SECONDS, volume = I.tool_volume))
return
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
if(stat & BROKEN)
@@ -147,7 +147,7 @@
new /obj/item/shard(loc)
else
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure [name].</span>")
new /obj/item/mounted/frame/newscaster_frame(loc)
new /obj/item/mounted/frame/display/newscaster_frame(loc)
qdel(src)
/obj/machinery/newscaster/welder_act(mob/user, obj/item/I)
code/modules/research/designs/autolathe_designs.dm
+26 -2
View File
@@ -587,8 +587,32 @@
name = "Newscaster Frame"
id = "newscaster_frame"
build_type = AUTOLATHE
materials = list(MAT_METAL = 14000, MAT_GLASS = 8000)
build_path = /obj/item/mounted/frame/newscaster_frame
materials = list(MAT_METAL = 6000, MAT_GLASS = 2000)
build_path = /obj/item/mounted/frame/display/newscaster_frame
category = list("initial", "Construction")
/datum/design/display_frame
name = "Status Display Frame"
id = "display_frame"
build_type = AUTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 2000)
build_path = /obj/item/mounted/frame/display/display_frame
category = list("initial", "Construction")
/datum/design/ai_display_frame
name = "AI Status Display Frame"
id = "ai_display_frame"
build_type = AUTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 2000)
build_path = /obj/item/mounted/frame/display/ai_display_frame
category = list("initial", "Construction")
/datum/design/entertainment_frame
name = "Entertainment Monitor Frame"
id = "entertainment_frame"
build_type = AUTOLATHE
materials = list(MAT_METAL = 6000, MAT_GLASS = 2000)
build_path = /obj/item/mounted/frame/display/entertainment_frame
category = list("initial", "Construction")
/datum/design/syringe