Skip to content

Commit 178a864

Browse files
authored
Fix the curse [MDB Ignore] (#804)
1 parent ac858f0 commit 178a864

4 files changed

Lines changed: 18 additions & 25 deletions

File tree

_maps/map_files/LimaStation/LimaStation.dmm

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17001,7 +17001,7 @@
1700117001
/obj/machinery/button/door/directional/east{
1700217002
name = "Security Mech Garage Door Controls";
1700317003
id = "secmechbay";
17004-
req_access = list("security")
17004+
req_access = list("brig")
1700517005
},
1700617006
/obj/effect/decal/cleanable/oil/slippery,
1700717007
/obj/effect/turf_decal/stripes,
@@ -17855,6 +17855,7 @@
1785517855
/obj/effect/turf_decal/siding/thinplating_new{
1785617856
dir = 8
1785717857
},
17858+
/obj/structure/sign/warning/secure_area/directional/east,
1785817859
/turf/open/floor/plating/airless,
1785917860
/area/space/nearstation)
1786017861
"fXe" = (
@@ -19363,7 +19364,7 @@
1936319364
/area/station/hallway/primary/port)
1936419365
"gxF" = (
1936519366
/obj/structure/lattice,
19366-
/obj/structure/sign/warning/directional/east,
19367+
/obj/structure/sign/warning/secure_area/directional/east,
1936719368
/turf/open/space/openspace,
1936819369
/area/space/nearstation)
1936919370
"gxK" = (
@@ -22772,14 +22773,6 @@
2277222773
},
2277322774
/turf/open/floor/plating,
2277422775
/area/station/maintenance/old_rec)
22775-
"hBv" = (
22776-
/obj/structure/grille,
22777-
/obj/structure/lattice,
22778-
/obj/effect/mapping_helpers/cycling_airlock_old/marker/inner_door{
22779-
dir = 8
22780-
},
22781-
/turf/open/space/basic,
22782-
/area/space/nearstation)
2278322776
"hBH" = (
2278422777
/obj/machinery/holopad,
2278522778
/obj/effect/turf_decal/bot,
@@ -35125,10 +35118,6 @@
3512535118
/obj/structure/closet/crate/cardboard,
3512635119
/turf/open/floor/plating,
3512735120
/area/station/commons/vacant_room/commissary)
35128-
"lwz" = (
35129-
/obj/structure/detectiveboard/directional/north,
35130-
/turf/open/floor/iron/dark,
35131-
/area/station/security/lockers)
3513235121
"lwC" = (
3513335122
/obj/machinery/duct,
3513435123
/obj/effect/decal/cleanable/dirt,
@@ -54481,6 +54470,7 @@
5448154470
/obj/effect/turf_decal/siding/thinplating_new{
5448254471
dir = 8
5448354472
},
54473+
/obj/structure/sign/warning/secure_area/directional/east,
5448454474
/turf/open/floor/plating/airless,
5448554475
/area/space/nearstation)
5448654476
"ruz" = (
@@ -65839,7 +65829,6 @@
6583965829
/area/station/security/detectives_office)
6584065830
"uUH" = (
6584165831
/obj/machinery/light/small/directional/east,
65842-
/obj/structure/sign/warning/directional/east,
6584365832
/obj/structure/lattice/catwalk,
6584465833
/turf/open/floor/engine/hull,
6584565834
/area/space/nearstation)
@@ -71170,7 +71159,7 @@
7117071159
/turf/closed/wall/r_wall,
7117171160
/area/station/engineering/gravity_generator)
7117271161
"wOB" = (
71173-
/obj/structure/sign/warning/directional/east,
71162+
/obj/structure/sign/warning/secure_area/directional/east,
7117471163
/turf/open/space/openspace,
7117571164
/area/space)
7117671165
"wOD" = (
@@ -71189,7 +71178,8 @@
7118971178
},
7119071179
/obj/machinery/button/door/directional/west{
7119171180
name = "Security Mech Garage Door Controls";
71192-
id = "secmechbay"
71181+
id = "secmechbay";
71182+
req_access = list("brig")
7119371183
},
7119471184
/turf/open/floor/iron/dark/smooth_edge{
7119571185
dir = 4
@@ -73377,12 +73367,14 @@
7337773367
/area/station/security/brig)
7337873368
"xxv" = (
7337973369
/obj/machinery/light/small/directional/east,
73380-
/obj/structure/sign/warning/directional/east,
7338173370
/obj/structure/lattice/catwalk,
7338273371
/obj/machinery/camera/directional/east{
7338373372
dir = 6;
7338473373
c_tag = "Security - External Airlock Access"
7338573374
},
73375+
/obj/structure/sign/nanotrasen{
73376+
pixel_x = 32
73377+
},
7338673378
/turf/open/floor/engine/hull,
7338773379
/area/space/nearstation)
7338873380
"xxD" = (
@@ -102332,7 +102324,7 @@ gso
102332102324
gEg
102333102325
ejk
102334102326
tAZ
102335-
lwz
102327+
ovq
102336102328
iBI
102337102329
nTg
102338102330
cyI
@@ -126816,7 +126808,7 @@ ymg
126816126808
ymg
126817126809
ymg
126818126810
hqS
126819-
hBv
126811+
hqS
126820126812
ymg
126821126813
ymg
126822126814
ymg

code/datums/quirks/negative_quirks/prosopagnosia.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/// Conceals the names of other mobs
1919
/datum/status_effect/grouped/see_no_names
2020
id = "see_no_names"
21+
alert_type = null
2122
/// If TRUE, the owner can still see ID names
2223
var/see_ids = FALSE
2324

code/modules/mob/living/carbon/human/human_helpers.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
return signal_face // no need to null-check, because force_set will always set a signal_face
5151

5252
var/face_name = isnull(signal_face) ? get_face_name("") : signal_face
53-
var/id_name = isnull(signal_id) ? get_id_name("", honorifics = TRUE) : signal_id
53+
var/id_name = isnull(signal_id) ? get_id_name("", honorifics = add_id_name) : signal_id
5454

5555
// We need to account for real name
5656
if(force_real_name)
57-
var/disguse_name = get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
57+
var/disguse_name = get_visible_name(add_id_name = add_id_name, force_real_name = FALSE)
5858
return "[real_name][disguse_name == real_name ? "" : " (as [disguse_name])"]"
5959

6060
// We're just some unknown guy

code/modules/surgery/internal_bleeding.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
display_results(
5959
user,
6060
target,
61-
span_green("You've finishes repairing all the arterial damage in [in_where]."),
62-
span_green("[user] finishes repaiing all the arterial damage in [in_where] with [tool]!"),
63-
span_green("[user] finishes repaiing all the arterial damage in [in_where]!"),
61+
span_green("You've finished repairing all the arterial damage in [in_where]."),
62+
span_green("[user] finished repairing all the arterial damage in [in_where] with [tool]!"),
63+
span_green("[user] finished repairing all the arterial damage in [in_where]!"),
6464
)
6565
repeatable = FALSE
6666
return ..()

0 commit comments

Comments
 (0)