Skip to content

Commit

Permalink
ruin plament test plus renames
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Jan 19, 2025
1 parent ac7dadc commit e4e06ef
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3229,7 +3229,7 @@
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/loot,
/obj/item/wallframe/bounty_viewer,
/obj/item/wallframe/mission_viewer,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ruin/jungle/cavecrew/cargo)
"Nf" = (
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list(
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio/simple_vent_controller,
/obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
/obj/structure/mirror, /obj/structure/cabinet, /obj/machinery/computer/security/telescreen/entertainment,
/obj/structure/sign/picture_frame, /obj/machinery/bounty_viewer
/obj/structure/sign/picture_frame, /obj/machinery/mission_viewer
)))

GLOBAL_LIST_INIT(WALLITEMS_EXTERNAL, typecacheof(list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,13 +351,8 @@

//Supply

/obj/item/circuitboard/computer/bounty
name = "\improper Outpost Bounty Console (Computer Board)"
icon_state = "supply"
build_path = /obj/machinery/computer/mission

/obj/item/circuitboard/computer/mission
name = "\improper Outpost Mission Console"
name = "\improper Outpost Mission Console (Computer Board)"
icon_state = "supply"
build_path = /obj/machinery/computer/mission

Expand Down
18 changes: 9 additions & 9 deletions code/modules/missions/mission_board.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,21 +124,21 @@
icon = 'icons/obj/telescience.dmi'
icon_state = "pad-idle"

/obj/machinery/bounty_viewer
name = "bounty viewer"
/obj/machinery/mission_viewer
name = "mission viewer"
desc = "A multi-platform network for placing requests across the sector, this one is view only."
icon = 'icons/obj/terminals.dmi'
icon_state = "request_kiosk"
light_color = LIGHT_COLOR_GREEN

/obj/machinery/bounty_viewer/Initialize(mapload, ndir, building)
/obj/machinery/mission_viewer/Initialize(mapload, ndir, building)
. = ..()
if(building)
setDir(ndir)
pixel_x = (dir & 3)? 0 : (dir == 4 ? -32 : 32)
pixel_y = (dir & 3)? (dir ==1 ? -32 : 32) : 0

/obj/machinery/bounty_viewer/wrench_act(mob/living/user, obj/item/I)
/obj/machinery/mission_viewer/wrench_act(mob/living/user, obj/item/I)
. = ..()
to_chat(user, span_notice("You start [anchored ? "un" : ""]securing [name]..."))
I.play_tool_sound(src)
Expand All @@ -150,16 +150,16 @@
new /obj/item/shard(loc)
else
to_chat(user, span_notice("You [anchored ? "un" : ""]secure [name]."))
new /obj/item/wallframe/bounty_viewer(loc)
new /obj/item/wallframe/mission_viewer(loc)
qdel(src)

/obj/machinery/bounty_viewer/ui_interact(mob/user, datum/tgui/ui)
/obj/machinery/mission_viewer/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "MissionBoard", name)
ui.open()

/obj/machinery/bounty_viewer/ui_data(mob/user)
/obj/machinery/mission_viewer/ui_data(mob/user)
var/list/data = list()
data["missions"] = list()
for(var/datum/mission/ruin/M as anything in SSmissions.active_missions)
Expand All @@ -168,10 +168,10 @@
data["id_inserted"] = FALSE
return data

/obj/item/wallframe/bounty_viewer
/obj/item/wallframe/mission_viewer
name = "disassembled bounty viewer"
desc = "Used to build a new bounty viewer, just secure to the wall."
icon_state = "request_kiosk"
custom_materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000)
result_path = /obj/machinery/bounty_viewer
result_path = /obj/machinery/mission_viewer
inverse = FALSE
2 changes: 1 addition & 1 deletion code/modules/overmap/overmap_inspect.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
if(istype(focus, /datum/overmap))
focus.admin_load()
if("inspect_mission")
var/datum/mission/ruin/mission = locate(params["ref"])
//var/datum/mission/ruin/mission = locate(params["ref"])
if("load_mission")
if(!check_rights(R_DEBUG))
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/designs/autolathe_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
id = "bountyboard_frame"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 14000, /datum/material/glass = 8000)
build_path = /obj/item/wallframe/bounty_viewer
build_path = /obj/item/wallframe/mission_viewer
category = list("initial", "Construction")

/datum/design/syringe
Expand Down
7 changes: 0 additions & 7 deletions code/modules/research/designs/comp_board_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO

/datum/design/board/bounty
name = "Computer Design (Bounty Console)"
desc = "Allows for the construction of circuit boards used to build a Bounty Console."
id = "bounty"
build_path = /obj/item/circuitboard/computer/bounty
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO

/datum/design/board/mining
name = "Computer Design (Outpost Status Display)"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/unit_tests/ruin_placement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
ruin.height
)

var/dynamic_missions = list()
for(var/datum/mission/ruin/mission_type in ruin.dynamic_mission_types)
dynamic_missions += new mission_type(src, 1 + length(dynamic_missions))

ruin.load(vlevel.get_unreserved_bottom_left_turf())

var/list/errors = atmosscan(TRUE, TRUE)
Expand Down

0 comments on commit e4e06ef

Please sign in to comment.