diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index b8313c5f97..f07d0ae674 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -63,6 +63,9 @@ ///////////////////////////////////////// //Seals and Signet Rings + +/obj/item/clothing/gloves/ring/seal + var/stamptext = null /obj/item/clothing/gloves/ring/seal/secgen name = "Secretary-General's official seal" desc = "The official seal of the Secretary-General of the Sol Central Government, featured prominently on a silver ring." diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 95bcda3b36..f79848de56 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -580,11 +580,20 @@ return else if(istype(P, /obj/item/weapon/stamp) || istype(P, /obj/item/clothing/gloves/ring/seal)) + if(istype(P, /obj/item/weapon/stamp)) + var/obj/item/weapon/stamp/the_stamp = P + if(the_stamp.stamptext) + stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" + else + stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]." + else + var/obj/item/clothing/gloves/ring/seal/the_stamp = P + if(the_stamp.stamptext) + stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" + else + stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]." if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) return - - stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." - var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') var/x, y if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index be60632186..c2d610f355 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -14,6 +14,7 @@ attack_verb = list("stamped") drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' + var/stamptext = null /obj/item/weapon/stamp/captain name = "site manager's rubber stamp"