Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/map_files/EclipseStation/EclipseStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -83668,7 +83668,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"jfR" = (
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_y = 32
},
/turf/open/floor/wood,
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/IceBox/IceBox.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -23646,8 +23646,8 @@
c_tag = "Bridge Center";
dir = 1
},
/obj/structure/fireaxecabinet{
pixel_y = -32
/obj/structure/fireaxecabinet/bridge{
pixel_y = -30
},
/obj/effect/turf_decal/tile/blue{
dir = 0
Expand Down Expand Up @@ -58808,7 +58808,7 @@
/obj/machinery/light_switch{
pixel_y = 28
},
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_x = 2;
pixel_y = 32
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9874,7 +9874,7 @@
/obj/item/crowbar/red,
/obj/item/flashlight,
/obj/item/flashlight,
/obj/structure/fireaxecabinet{
/obj/structure/fireaxecabinet/bridge{
pixel_y = -30
},
/obj/machinery/door/window/northright{
Expand Down Expand Up @@ -99085,7 +99085,7 @@
},
/obj/structure/closet/secure_closet/captains,
/obj/effect/turf_decal/bot,
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_x = 32
},
/turf/open/floor/plasteel/dark,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Omegastation/omegastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20347,7 +20347,7 @@
},
/obj/structure/table/wood,
/obj/item/phone/real,
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_x = 32
},
/turf/open/floor/wood,
Expand Down Expand Up @@ -26552,7 +26552,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/structure/fireaxecabinet{
/obj/structure/fireaxecabinet/bridge{
pixel_y = -32
},
/obj/effect/turf_decal/tile/neutral{
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/YogStation/YogStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -35829,7 +35829,7 @@
/turf/open/floor/plasteel/white,
/area/science/mixing/chamber)
"eDw" = (
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_y = 32
},
/turf/open/floor/carpet/blue,
Expand Down Expand Up @@ -40898,7 +40898,7 @@
"igi" = (
/obj/machinery/light,
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/fireaxecabinet{
/obj/structure/fireaxecabinet/bridge{
pixel_y = -32
},
/obj/effect/turf_decal/caution/white{
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/YogsDelta/YogsDelta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -54714,8 +54714,8 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bGZ" = (
/obj/structure/fireaxecabinet{
pixel_y = -28
/obj/structure/fireaxecabinet/bridge{
pixel_y = -32
},
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/blue,
Expand Down Expand Up @@ -125954,7 +125954,7 @@
/obj/item/storage/secure/safe{
pixel_x = 32
},
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_y = 32
},
/turf/open/floor/plasteel/grimy,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Yogsmeta/Yogsmeta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -35357,7 +35357,7 @@
/turf/open/space,
/area/aisat)
"bqU" = (
/obj/structure/fireaxecabinet{
/obj/structure/fireaxecabinet/bridge{
pixel_y = -32
},
/obj/item/paper_bin{
Expand Down Expand Up @@ -76395,7 +76395,7 @@
/obj/machinery/recharger{
pixel_y = 4
},
/obj/structure/fireaxecabinet/spare{
/obj/structure/fireaxecabinet/bridge/spare{
pixel_x = 32
},
/turf/open/floor/wood,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
alarmed.burglaralert(src)
playsound(src, 'sound/effects/alert.ogg', 50, TRUE)

/obj/structure/fireaxecabinet/spare
/obj/structure/fireaxecabinet/bridge/spare
name = "spare id cabinet"
desc = "There is a small label that reads \"For Emergency use only\". <BR>There are bolts under it's glass cover for easy disassembly using a wrench."
icon = 'icons/obj/wallmounts.dmi'
Expand All @@ -249,7 +249,7 @@
armor = list("melee" = 30, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
axe = FALSE

/obj/structure/fireaxecabinet/spare/Initialize()
/obj/structure/fireaxecabinet/bridge/spare/Initialize()
. = ..()
fireaxe = null
spareid = new(src)
Expand Down
5 changes: 4 additions & 1 deletion yogstation/code/game/objects/structures/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
req_access = list(ACCESS_ATMOSPHERICS) //adds ATMOSPHERICS access requirement for the lock on the cabinet.
var/datum/effect_system/spark_spread/spark_system //the spark system, used for generating... sparks?

/obj/structure/fireaxecabinet/bridge
req_access = list(ACCESS_CAPTAIN)

/obj/structure/fireaxecabinet/Initialize()//<-- mirrored/overwritten proc
. = ..()
fireaxe = new
Expand Down Expand Up @@ -100,4 +103,4 @@
locked = 0
audible_message("You hear an audible clunk as the [name]'s bolt retracts.")
update_icon()
//Fireaxe Cabinet is now permanently unlocked.
//Fireaxe Cabinet is now permanently unlocked.