Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme

code/game/objects/items/weapons/storage/firstaid.dm

@@ -295,11 +295,11 @@
 				for(var/obj/item/reagent_containers/food/pill/P in contents)
 					P.attack(C, C)
 				C.visible_message("<span class='danger'>[C] [rapid_post_instake_message]</span>")
-		return
+			return
 
 	return ..()
 
-/obj/item/storage/pill_bottle/attackby(var/obj/item/I, mob/user as mob, params)
+/obj/item/storage/pill_bottle/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
 		var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
 		if(length(tmp_label) > MAX_NAME_LEN)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -254,6 +254,13 @@
 	new /obj/item/ammo_casing/shotgun/assassination(src)
 	new /obj/item/gun/projectile/revolver/doublebarrel/improvised/cane(src)
 
+/obj/item/storage/box/syndie_kit/fake_revolver
+	name = "trick revolver kit"
+
+/obj/item/storage/box/syndie_kit/fake_revolver/New()
+	..()
+	new /obj/item/toy/russian_revolver/trick_revolver(src)
+
 /obj/item/storage/box/syndie_kit/mimery
 	name = "advanced mimery kit"