Merge pull request #3258 from CHOMPStation2/upstream-merge-11935

[MIRROR] Custom item for Coolcrow420, minor change to stamp code

code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm

@@ -234,6 +234,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

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."

code/modules/paperwork/paper.dm

@@ -597,11 +597,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=="" ? "<HR>" : "<BR>") + "<i>[the_stamp.stamptext]</i>"
+			else
+				stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [the_stamp.name].</i>"
+		else
+			var/obj/item/clothing/gloves/ring/seal/the_stamp = P
+			if(the_stamp.stamptext)
+				stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>[the_stamp.stamptext]</i>"
+			else
+				stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [the_stamp.name].</i>"
 		if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P))
 			return
-
-		stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [P.name].</i>"
-
 		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))

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"

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1409,3 +1409,11 @@ End CHOMP Removal*/
 	pickup_sound = null
 	origin_tech = null
 	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"
+