Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pile of fixes #839

Merged
merged 2 commits into from
Feb 26, 2024
Merged

pile of fixes #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17791ee
pile of fixes
Kapu1178 Feb 25, 2024
bea6d71
fix cnd
Kapu1178 Feb 26, 2024
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
3 changes: 3 additions & 0 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7411,6 +7411,9 @@
/obj/structure/cable/yellow{
icon_state = "5"
},
/obj/structure/cable/yellow{
icon_state = "4"
},
/turf/open/floor/iron,
/area/station/engineering/monitoring)
"bYJ" = (
Expand Down
1 change: 1 addition & 0 deletions code/datums/components/food/edible.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ Behavior that's still missing from this component that original food items had t

var/datum/component/edible/E = ingredient
if (LAZYLEN(E.tastes))
LAZYINITLIST(tastes)
tastes = tastes.Copy()
for (var/t in E.tastes)
tastes[t] += E.tastes[t]
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/atm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@
return

if(href_list["eject_id"])
if(isnull(inserted_card))
return TRUE
inserted_card.forceMove(drop_location())
inserted_card = null
playsound(src, 'sound/machines/terminal_eject.ogg')
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/pinpointer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@

var/crewmember_name = "Unknown"
if(H.wear_id)
var/obj/item/card/id/I = H.wear_id.GetID()
var/obj/item/card/id/I = H.wear_id.GetID(TRUE)
if(I?.registered_name)
crewmember_name = I.registered_name

Expand Down
34 changes: 17 additions & 17 deletions code/modules/admin/verbs/adminpm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if(!holder)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM-Context: Only administrators may use this command."),
html = span_alert("Error: Admin-PM-Context: Only administrators may use this command."),
confidential = TRUE)
return
if(!ismob(M) || !M.client)
Expand All @@ -22,7 +22,7 @@
if(!holder)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM-Panel: Only administrators may use this command."),
html = span_alert("Error: Admin-PM-Panel: Only administrators may use this command."),
confidential = TRUE)
return

Expand All @@ -45,7 +45,7 @@
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
html = span_alert("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
confidential = TRUE)
return
var/client/C
Expand All @@ -59,7 +59,7 @@
if(holder)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: Client not found."),
html = span_alert("Error: Admin-PM: Client not found."),
confidential = TRUE)
return

Expand Down Expand Up @@ -87,11 +87,11 @@
else
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: Client not found."),
html = span_alert("Error: Admin-PM: Client not found."),
confidential = TRUE)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = "[span_danger("<b>Message not sent:</b>")]<br>[msg]",
html = "[span_alert("<b>Message not sent:</b>")]<br>[msg]",
confidential = TRUE)
AH.AddInteraction("<b>No client found, message not sent:</b><br>[msg]")
return
Expand All @@ -103,14 +103,14 @@
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
html = span_alert("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
confidential = TRUE)
return

if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."),
html = span_alert("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."),
confidential = TRUE)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
Expand All @@ -135,7 +135,7 @@
if(!recipient)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: Client not found."),
html = span_alert("Error: Admin-PM: Client not found."),
confidential = TRUE)
return

Expand All @@ -153,7 +153,7 @@
if(holder)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Use the admin IRC/Discord channel, nerd."),
html = span_alert("Error: Use the admin IRC/Discord channel, nerd."),
confidential = TRUE)
return

Expand All @@ -173,11 +173,11 @@
if(holder)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: Client not found."),
html = span_alert("Error: Admin-PM: Client not found."),
confidential = TRUE)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = "[span_danger("<b>Message not sent:</b>")]<br>[msg]",
html = "[span_alert("<b>Message not sent:</b>")]<br>[msg]",
confidential = TRUE)
if(recipient_ticket)
recipient_ticket.AddInteraction("<b>No client found, message not sent:</b><br>[msg]")
Expand All @@ -190,7 +190,7 @@
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
html = span_alert("Error: Admin-PM: You are unable to use admin PM-s (muted)."),
confidential = TRUE)
return

Expand Down Expand Up @@ -239,7 +239,7 @@
if(holder)
to_chat(recipient,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("[tag_in] <b>[key_name(src, TRUE, TRUE)]</b>: <span class='linkify'>[keywordparsedmsg]</span>"),
html = span_alert("[tag_in] <b>[key_name(src, TRUE, TRUE)]</b>: <span class='linkify'>[keywordparsedmsg]</span>"),
confidential = TRUE
)

Expand All @@ -264,7 +264,7 @@

to_chat(recipient,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("[tag_in] [replymsg]"),
html = span_alert("[tag_in] [replymsg]"),
confidential = TRUE
)

Expand Down Expand Up @@ -332,13 +332,13 @@
if(!current_ticket)
to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = span_danger("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."),
html = span_alert("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."),
confidential = TRUE
)

to_chat(src,
type = MESSAGE_TYPE_ADMINPM,
html = "[span_danger("<b>Message not sent:</b>")]<br>[msg]",
html = "[span_alert("<b>Message not sent:</b>")]<br>[msg]",
confidential = TRUE
)
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/debug.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/worn = H.wear_id
var/obj/item/worn = H.wear_id.GetID(TRUE)
var/obj/item/card/id/id = null

if(worn)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/antagonists/fugitive/fugitive_outfits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
/datum/outfit/spacepol/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.assignment = "Police Officer"
W.registered_name = H.real_name
W.update_label()
Expand Down Expand Up @@ -176,7 +176,7 @@
/datum/outfit/bountyarmor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand All @@ -201,7 +201,7 @@
/datum/outfit/bountyhook/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
return
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/gang/outfits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down
3 changes: 0 additions & 3 deletions code/modules/client/preferences/loadout/loadout_item/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
/datum/loadout_item/backpack/cigarettes
path = /obj/item/storage/fancy/cigarettes

/datum/loadout_item/backpack/wallet
path = /obj/item/storage/wallet

/datum/loadout_item/backpack/flask
path = /obj/item/reagent_containers/food/drinks/flask
cost = 2
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/outfits/ert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
if(W)
W.registered_name = H.real_name
W.update_label()
Expand Down Expand Up @@ -208,7 +208,7 @@
pda.saved_identification = H.real_name
pda.saved_job = "CentCom Official"

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -377,7 +377,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -532,7 +532,7 @@
var/obj/item/radio/R = H.ears
R.set_frequency(FREQ_CENTCOM)
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down
16 changes: 8 additions & 8 deletions code/modules/clothing/outfits/standard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -198,7 +198,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -261,7 +261,7 @@
pda.saved_identification = H.real_name
pda.saved_job = "Reaper"

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand All @@ -288,7 +288,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -376,7 +376,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)

W.registered_name = H.real_name
W.update_label()
Expand All @@ -400,7 +400,7 @@
if(visualsOnly)
return

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -445,7 +445,7 @@
internals_slot = ITEM_SLOT_SUITSTORE

/datum/outfit/debug/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down Expand Up @@ -477,7 +477,7 @@
internals_slot = ITEM_SLOT_SUITSTORE

/datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
W.registered_name = H.real_name
W.update_label()
W.update_icon()
Expand Down
7 changes: 7 additions & 0 deletions code/modules/grab/grab_object.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
/obj/item/hand_item/grab/Initialize(mapload, atom/movable/target, datum/grab/grab_type, use_offhand)
. = ..()
current_grab = GLOB.all_grabstates[grab_type]
if(isnull(current_grab))
stack_trace("Bad grab type requested: [grab_type || "NULL"]")
return INITIALIZE_HINT_QDEL

assailant = loc
if(!istype(assailant))
Expand Down Expand Up @@ -252,8 +255,12 @@
update_appearance()
leave_forensic_traces()

if(QDELETED(src))
return

if(!current_grab.enter_as_up(src, silent))
return

if(is_grab_unique(current_grab))
current_grab.apply_unique_grab_effects(src)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/_job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ GLOBAL_LIST_INIT(job_display_order, list(
if(!J)
J = SSjob.GetJob(H.job)

var/obj/item/card/id/card = H.wear_id.GetID()
var/obj/item/card/id/card = H.wear_id.GetID(TRUE)
if(istype(card))
ADD_TRAIT(card, TRAIT_JOB_FIRST_ID_CARD, ROUNDSTART_TRAIT)
shuffle_inplace(card.access) // Shuffle access list to make NTNet passkeys less predictable
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/bartender.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
/datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()

var/obj/item/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id.GetID(TRUE)
if(H.age < AGE_MINOR)
W.registered_age = AGE_MINOR
to_chat(H, span_notice("You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!"))
5 changes: 4 additions & 1 deletion code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,7 +2184,10 @@ GLOBAL_LIST_EMPTY(fire_appearances)
/mob/living/proc/needs_organ(slot)
return FALSE

/mob/living/proc/has_mouth()
/mob/proc/has_mouth()
return FALSE

/mob/living/has_mouth()
return TRUE

/mob/living/get_mouse_pointer_icon(check_sustained)
Expand Down
Loading
Loading