cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +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/game/objects/items/mountable_frames/newscaster_frame.dm
+37 -9
View File
@@ -1,19 +1,47 @@
/obj/item/mounted/frame/newscaster_frame
/obj/item/mounted/frame/display
icon = 'icons/obj/status_display.dmi'
icon_state = "frame"
item_state = "syringe_kit"
materials = list(MAT_METAL=6000, MAT_GLASS=2000)
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
metal_sheets_refunded = 3
glass_sheets_refunded = 1
var/build_path
/obj/item/mounted/frame/display/do_build(turf/on_wall, mob/user)
var/obj/machinery/status_display/N = new build_path(get_turf(src))
N.pixel_y -= (loc.y - on_wall.y) * 32
N.pixel_x -= (loc.x - on_wall.x) * 32
qdel(src)
/obj/item/mounted/frame/display/newscaster_frame
name = "newscaster frame"
desc = "Used to build newscasters, just secure to the wall."
icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster"
item_state = "syringe_kit" //no, I have no idea either
build_path = /obj/machinery/newscaster
materials = list(MAT_METAL=14000, MAT_GLASS=8000)
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
metal_sheets_refunded = 7
glass_sheets_refunded = 4
/obj/item/mounted/frame/newscaster_frame/do_build(turf/on_wall, mob/user)
var/obj/machinery/newscaster/N = new /obj/machinery/newscaster(get_turf(src), get_dir(on_wall, user), 1)
/obj/item/mounted/frame/display/newscaster_frame/do_build(turf/on_wall, mob/user)
var/obj/machinery/newscaster/N = new build_path(get_turf(src))
N.pixel_y -= (loc.y - on_wall.y) * 28
N.pixel_x -= (loc.x - on_wall.x) * 28
var/constrdir = user.dir
N.dir = turn(constrdir, 180)
qdel(src)
/obj/item/mounted/frame/display/display_frame
name = "status display frame"
desc = "Used to build status displays, just secure to the wall."
build_path = /obj/machinery/status_display
/obj/item/mounted/frame/display/ai_display_frame
name = "ai status display frame"
desc = "Used to build ai status displays, just secure to the wall."
build_path = /obj/machinery/ai_status_display
/obj/item/mounted/frame/display/entertainment_frame
name = "entertainment monitor frame"
desc = "Used to build entertainment monitors, just secure to the wall."
icon = 'icons/obj/computer.dmi'
icon_state = "entertainment_console"
build_path = /obj/machinery/computer/security/telescreen/entertainment