Merge pull request #12667 from GhostActual/aurora_bureaucracy

Aurora Bureaucracy

code/modules/paperwork/pen.dm

@@ -1,17 +1,23 @@
 /* Pens!
  * Contains:
  *		Pens
+ *		Coloured Pens
+ *		Fountain Pens
+ *		Multi Pen
+ *		Reagent Pens
+ *		Blade Pens
  *		Sleepy Pens
  *		Parapens
+ *		Chameleon Pen
+ *		Crayons
  */
 
-
 /*
  * Pens
  */
 /obj/item/weapon/pen
-	desc = "It's a normal black ink pen."
 	name = "pen"
+	desc = "It's a normal black ink pen."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "pen"
 	item_state = "pen"
@@ -33,6 +39,9 @@
 	to_chat(user, "<span class='notice'>Click.</span>")
 	playsound(src, 'sound/items/penclick.ogg', 50, 1)
 
+/*
+ * Coloured Pens
+ */
 /obj/item/weapon/pen/blue
 	desc = "It's a normal blue ink pen."
 	icon_state = "pen_blue"
@@ -43,6 +52,9 @@
 	icon_state = "pen_red"
 	colour = "red"
 
+/*
+ * Fountain Pens
+ */
 /obj/item/weapon/pen/fountain
 	desc = "A well made fountain pen, with a faux wood body."
 	icon_state = "pen_fountain"
@@ -56,9 +68,33 @@
 	icon_state = "pen_fountain"
 
 /obj/item/weapon/pen/fountain4
-	desc = "command fountain pen"
+	desc = "A well made and expensive fountain pen. This one has silver accents."
-	icon_state = "A well made and expensive fountain pen. The nib is quite sharp."
+	icon_state = "blues_fountain"
 
+/obj/item/weapon/pen/fountain5
+	desc = "A well made and expensive fountain pen. This one has gold accents."
+	icon_state = "blueg_fountain"
+
+/obj/item/weapon/pen/fountain6
+	desc = "A well made and expensive fountain pen. The nib is quite sharp."
+	icon_state = "command_fountain"
+
+/obj/item/weapon/pen/fountain7
+	desc = "A well made and expensive fountain pen made from gold."
+	icon_state = "gold_fountain"
+
+/obj/item/weapon/pen/fountain8
+	desc = "A well made and expensive fountain pen."
+	icon_state = "black_fountain"
+
+/obj/item/weapon/pen/fountain9
+	desc = "A well made and expensive fountain pen made for gesturing."
+	icon_state = "mime_fountain"
+
+
+/*
+ * Multi Pen
+ */
 /obj/item/weapon/pen/multi
 	desc = "It's a pen with multiple colors of ink!"
 	var/selectedColor = 1
@@ -88,7 +124,7 @@
 	colour = "white"
 
 /*
- * Reagent pens
+ * Reagent Pens
  */
 
 /obj/item/weapon/pen/reagent
@@ -114,9 +150,8 @@
 				add_attack_logs(user,M,"Injected with [src.name] containing [contained], trasferred [trans] units")
 
 /*
- * Blade pens.
+ * Blade Pens
  */
-
 /obj/item/weapon/pen/blade
 	desc = "It's a normal black ink pen."
 	description_antag = "This pen can be transformed into a dangerous melee and thrown assassination weapon with an Alt-Click.\
@@ -229,7 +264,7 @@
 	reagents.add_reagent("cryptobiolin", 10)
 
 /*
- * Chameleon pen
+ * Chameleon Pen
  */
 /obj/item/weapon/pen/chameleon
 	var/signature = ""
@@ -287,7 +322,6 @@
 /*
  * Crayons
  */
-
 /obj/item/weapon/pen/crayon
 	name = "crayon"
 	desc = "A colourful crayon. Please refrain from eating it or putting it in your nose."

code/modules/paperwork/photocopier.dm

@@ -2,8 +2,8 @@
 	name = "photocopier"
 	desc = "Copy all your important papers here!"
 	icon = 'icons/obj/library.dmi'
-	icon_state = "bigscanner"
+	icon_state = "photocopier"
-	var/insert_anim = "bigscanner1"
+	var/insert_anim = "photocopier_scan"
 	anchored = TRUE
 	density = TRUE
 	use_power = USE_POWER_IDLE
@@ -157,11 +157,15 @@
 		if(toner <= 10) //allow replacing when low toner is affecting the print darkness
 			user.drop_item()
 			to_chat(user, "<span class='notice'>You insert the toner cartridge into \the [src].</span>")
+			flick("photocopier_toner", src)
+			playsound(loc, 'sound/machines/click.ogg', 50, 1)
 			var/obj/item/device/toner/T = O
 			toner += T.toner_amount
 			qdel(O)
 		else
 			to_chat(user, "<span class='notice'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>")
+			flick("photocopier_notoner", src)
+			playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1)
 	else if(O.is_wrench())
 		playsound(src, O.usesound, 50, 1)
 		anchored = !anchored

code/modules/paperwork/stamps.dm

@@ -49,6 +49,10 @@
 	icon_state = "stamp-deny"
 	attack_verb = list("DENIED")
 
+/obj/item/weapon/stamp/accepted
+	name = "\improper ACCEPTED rubber stamp"
+	icon_state = "stamp-ok"
+
 /obj/item/weapon/stamp/clown
 	name = "clown's rubber stamp"
 	icon_state = "stamp-clown"
@@ -73,6 +77,29 @@
 	name = "\improper Sol Government rubber stamp"
 	icon_state = "stamp-sg"
 
+/obj/item/weapon/stamp/solgov
+	name = "\improper Sol Government rubber stamp"
+	icon_state = "stamp-sg"
+
+/obj/item/weapon/stamp/solgovlogo
+	name = "\improper Sol Government logo stamp"
+	icon_state = "stamp-sol"
+
+/obj/item/weapon/stamp/solgovlogo
+	name = "\improper Sol Government logo stamp"
+	icon_state = "stamp-sol"
+
+/obj/item/stamp/einstein
+	name = "\improper Einstein Engines rubber stamp"
+	icon_state = "stamp-einstein"
+
+/obj/item/stamp/hephaestus
+	name = "\improper Hephaestus Industries rubber stamp"
+	icon_state = "stamp-heph"
+
+/obj/item/stamp/zeng_hu
+	name = "\improper Zeng-Hu Pharmaceuticals rubber stamp"
+	icon_state = "stamp-zenghu"
 
 // Syndicate stamp to forge documents.
 /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)