From f4a487ee32140f10344df1b55066c06dc5ebc644 Mon Sep 17 00:00:00 2001
From: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:06:02 +0000
Subject: [PATCH] IDs show your age if you're not old enough to drink in the
US. (#3586)
* IDs show your age if you're not old enough to drink.
* Update _vending.dm
---
code/game/objects/items/cards_ids.dm | 2 +-
code/modules/vending/_vending.dm | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index c3205394f85..e3b2345c9a7 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -106,7 +106,7 @@
if(Adjacent(user))
var/minor
if(registered_name && registered_age && registered_age < AGE_MINOR)
- minor = " (MINOR)"
+ minor = " [registered_age]"
user.visible_message("[user] shows you: [icon2html(src, viewers(user))] [src.name][minor].", "You show \the [src.name][minor].")
add_fingerprint(user)
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 1d845757c82..f69eae24aac 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -849,7 +849,8 @@ GLOBAL_LIST_EMPTY(vending_products)
say("You are not of legal age to purchase [R.name].")
if(!(usr in GLOB.narcd_underages))
Radio.set_frequency(FREQ_SECURITY)
- Radio.talk_into(src, "SECURITY ALERT: Underaged crewmember [usr] recorded attempting to purchase [R.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY)
+ // SKYRAT EDIT: Original - Radio.talk_into(src, "SECURITY ALERT: Underaged crewmember [usr] recorded attempting to purchase [R.name] in [get_area(src)]. Please watch for substance abuse.", FREQ_SECURITY)
+ Radio.talk_into(src, "SECURITY ALERT: [usr] has attempted to purchase [R.name] in [get_area(src)] whilst not of legal drinking age. Please watch for substance abuse.", FREQ_SECURITY) // SKYRAT EDIT: Just worded slightly differently.
GLOB.narcd_underages += usr
flick(icon_deny,src)
vend_ready = TRUE