Skip to content
Open
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
445 changes: 222 additions & 223 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

49 changes: 28 additions & 21 deletions _maps/map_files/LimaStation/LimaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"acU" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/sleeper/cryo{
dir = 8
},
/turf/open/floor/iron,
/area/station/security/prison)
"adb" = (
/obj/machinery/firealarm/directional/south,
/obj/machinery/vending/tool,
Expand Down Expand Up @@ -1018,7 +1025,7 @@
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/effect/spawner/random/entertainment/arcade{
/obj/machinery/sleeper/cryo{
dir = 8
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -3565,7 +3572,7 @@
dir = 8
},
/obj/machinery/airalarm/directional/south,
/obj/effect/spawner/random/entertainment/arcade{
/obj/machinery/sleeper/cryo{
dir = 4
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -9774,14 +9781,14 @@
/turf/open/floor/wood/large,
/area/station/maintenance/old_rec)
"dmO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/camera/directional/south{
c_tag = "Prison Wing - Foyer";
network = list("ss13", "prison")
},
/obj/machinery/sleeper/cryo{
dir = 4
},
/turf/open/floor/iron,
/area/station/security/prison)
"dng" = (
Expand Down Expand Up @@ -16354,6 +16361,9 @@
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/neutral,
/obj/structure/noticeboard/directional/south,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/turf/open/floor/iron,
/area/station/security/prison)
"fze" = (
Expand Down Expand Up @@ -36194,16 +36204,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/maintenance/port/lower)
"lOt" = (
/obj/effect/turf_decal/siding/wideplating{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/turf/open/floor/iron,
/area/station/security/prison)
"lOB" = (
/obj/effect/turf_decal/tile/red{
dir = 4
Expand Down Expand Up @@ -37826,7 +37826,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
/obj/effect/spawner/random/entertainment/arcade{
/obj/machinery/sleeper/cryo{
dir = 4
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -52305,6 +52305,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"qMm" = (
/obj/machinery/duct,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/checker,
/area/station/security/prison)
"qMo" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -71327,7 +71333,7 @@
},
/obj/structure/cable,
/obj/machinery/newscaster/directional/east,
/obj/effect/spawner/random/entertainment/arcade{
/obj/machinery/sleeper/cryo{
dir = 8
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -72785,6 +72791,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/security/prison)
"xon" = (
Expand Down Expand Up @@ -73587,7 +73594,7 @@
},
/obj/structure/cable,
/obj/machinery/firealarm/directional/east,
/obj/effect/spawner/random/entertainment/arcade{
/obj/machinery/sleeper/cryo{
dir = 8
},
/turf/open/floor/iron/freezer,
Expand Down Expand Up @@ -94629,7 +94636,7 @@ iIy
sJB
sJB
qQq
dzL
acU
eyn
cYc
wOX
Expand Down Expand Up @@ -95396,7 +95403,7 @@ riq
vLL
hrv
xoh
lhT
qMm
aRO
aRO
mFV
Expand Down Expand Up @@ -95909,7 +95916,7 @@ bID
nkV
jzw
aJs
lOt
iQf
vis
dzL
dzL
Expand Down
39 changes: 17 additions & 22 deletions _maps/map_files/PubbyStation/PubbyStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8865,7 +8865,7 @@
department = "Dormitories";
name = "Dorms Requests Console"
},
/obj/structure/tank_holder/extinguisher,
/obj/machinery/vending/snack/blue,
/turf/open/floor/iron/corner{
dir = 1
},
Expand Down Expand Up @@ -34311,17 +34311,12 @@
/turf/open/floor/iron/edge,
/area/station/security/brig)
"emV" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/status_display/evac/directional/west,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"enI" = (
/obj/machinery/vending/cola/red,
/turf/open/floor/iron/white/smooth_large,
/area/station/commons/fitness/recreation)
"enO" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
Expand Down Expand Up @@ -39370,6 +39365,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"ibu" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/sleeper/cryo{
dir = 8
},
/turf/open/floor/iron/dark/side{
dir = 1
},
/area/station/security/prison)
"ibw" = (
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
dir = 4
Expand Down Expand Up @@ -43332,7 +43336,7 @@
/turf/open/floor/iron/smooth_half,
/area/station/science/robotics/mechbay)
"low" = (
/obj/machinery/vending/snack/blue,
/obj/machinery/sleeper/cryo,
/turf/open/floor/iron/white/smooth_large,
/area/station/commons/fitness/recreation)
"lpB" = (
Expand Down Expand Up @@ -43884,11 +43888,6 @@
/obj/item/wrench,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
"lJM" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"lJR" = (
/obj/effect/turf_decal/tile/yellow/half{
dir = 1
Expand Down Expand Up @@ -48105,10 +48104,6 @@
"oMN" = (
/turf/open/floor/iron/stairs/left,
/area/station/service/abandoned_gambling_den)
"oNs" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/white/smooth_large,
/area/station/commons/fitness/recreation)
"oND" = (
/obj/machinery/meter,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -56822,6 +56817,7 @@
/area/station/medical/medbay/central)
"uFi" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/iron/corner{
dir = 8
},
Expand Down Expand Up @@ -59327,7 +59323,7 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"wwE" = (
/obj/structure/table,
/obj/machinery/vending/cola/red,
/turf/open/floor/iron/edge{
dir = 4
},
Expand Down Expand Up @@ -60110,7 +60106,6 @@
"wRG" = (
/obj/structure/closet/lasertag/red,
/obj/effect/turf_decal/tile/blue,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white/corner{
dir = 4
},
Expand Down Expand Up @@ -84542,7 +84537,7 @@ aem
nud
iTv
agd
agp
ibu
ahp
agM
asA
Expand Down Expand Up @@ -103322,10 +103317,10 @@ sFK
sFK
sFK
aiS
enI
low
fVJ
lFK
lJM
lFK
duC
rrM
pcg
Expand Down Expand Up @@ -103579,7 +103574,7 @@ aiT
aiS
sFK
aiS
oNs
low
eHq
wKP
wRG
Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,7 @@
#define UPPER_LIP "Upper"
#define MIDDLE_LIP "Middle"
#define LOWER_LIP "Lower"

// Latejoin Spawnpoints
#define SPAWNPOINT_CRYO "Cryogenic Storage"
#define SPAWNPOINT_ARRIVALS "Arrivals Shuttle"
16 changes: 8 additions & 8 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,21 +184,21 @@ GLOBAL_LIST_INIT(skin_tone_names, list(
*
* Checks that `user` does not move, change hands, get stunned, etc. for the
* given `delay`. Returns `TRUE` on success or `FALSE` on failure.
*
*
* @param {mob} user - The mob performing the action.
*
*
* @param {number} delay - The time in deciseconds. Use the SECONDS define for readability. `1 SECONDS` is 10 deciseconds.
*
*
* @param {atom} target - The target of the action. This is where the progressbar will display.
*
*
* @param {flag} timed_action_flags - Flags to control the behavior of the timed action.
*
*
* @param {boolean} progress - Whether to display a progress bar / cogbar.
*
*
* @param {datum/callback} extra_checks - Additional checks to perform before the action is executed.
*
*
* @param {string} interaction_key - The assoc key under which the do_after is capped, with max_interact_count being the cap. Interaction key will default to target if not set.
*
*
* @param {number} max_interact_count - The maximum amount of interactions allowed.
*/
/proc/do_after(mob/user, delay, atom/target, timed_action_flags = NONE, progress = TRUE, datum/callback/extra_checks, interaction_key, max_interact_count = 1, hidden = FALSE)
Expand Down
4 changes: 4 additions & 0 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
/// Boolean. If TRUE, the Click() proc will attempt to Click() on the master first if there is a master.
var/click_master = TRUE

/atom/movable/screen/alert/Initialize(mapload, datum/hud/hud_owner)
. = ..()
if(mouse_over_pointer == MOUSE_HAND_POINTER)
add_filter("clickglow", 2, outline_filter(color = COLOR_GOLD, size = 1))

/atom/movable/screen/alert/MouseEntered(location,control,params)
. = ..()
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/announcement_system.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message = CompileText(newhead, user, rank)
else if(message_type == "ARRIVALS_BROKEN")
message = "The arrivals shuttle has been damaged. Docking for repairs..."
else if(message_type == "DESPAWN")
message = CompileText("%PERSON, %RANK, has entered cryogenic storage.", user, rank)

broadcast(message, channels)

Expand Down
Loading
Loading