Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-08-30 21:38:17 +01:00
47 changed files with 850 additions and 631 deletions
+2
View File
@@ -18,6 +18,7 @@
/client/verb/adminspice()
set category = "Admin"
set name = "Request Spice"
set desc = "Request admins to spice round up for you"
//handle muting and automuting
if(prefs.muted & MUTE_ADMINHELP)
@@ -26,6 +27,7 @@
if(alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.",,"No","Yes") != "No")
message_admins("[ADMIN_FULLMONTY(usr)] has requested the round be spiced up a little.")
to_chat(usr, "<span class='notice'>You have requested some more spice in your round.</span>")
else
to_chat(usr, "<span class='notice'>Spice request cancelled.</span>")
return
+2 -2
View File
@@ -282,11 +282,11 @@
var/obj/item/device/pda/pda = H.wear_id
id = pda.id
id.icon_state = "gold"
id.access = get_all_accesses()
id.access = get_all_accesses().Copy()
else
var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M);
id.icon_state = "gold"
id.access = get_all_accesses()
id.access = get_all_accesses().Copy()
id.registered_name = H.real_name
id.assignment = "Colony Director"
id.name = "[id.registered_name]'s ID Card ([id.assignment])"