diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 62d3fcc8ae1..649939ba8bf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -296,6 +296,12 @@ ckeywhitelist = list("chaleur") character_name = list("Hisako Arato") +/datum/gear/fluff/jade_stamp + path = /obj/item/weapon/stamp/fluff/jade_horror + display_name = "Official Council of Mid Horror rubber stamp" + ckeywhitelist = list("coolcrow420") + character_name = list("Jade Davis") + // D CKEYS /datum/gear/fluff/dhaeleena_medal path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index b8313c5f979..f07d0ae6747 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 95bcda3b36b..f79848de565 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 be60632186b..c2d610f3556 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" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index ad638eaff04..7663a09ea4d 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1399,6 +1399,7 @@ new /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold) new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold) + //Hunterbirk - Amaryll //This is a 'technical item' which basically is meant to represent rippiing things up with bare claws. /obj/item/weapon/surgical/scalpel/amaryll_claws @@ -1409,4 +1410,12 @@ drop_sound = null pickup_sound = null origin_tech = null - matter = null \ No newline at end of file + matter = null + +//Coolcrow420 - Jade Davis +/obj/item/weapon/stamp/fluff/jade_horror + name = "Council of Mid Horror rubber stamp" + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "stamp-midhorror" + stamptext = "This paper has been certified by The Council of Mid Horror" + diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 9b84b0f92c5..b98f92406f2 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ