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

code/game/objects/items/cardboard_cutouts.dm

@@ -74,12 +74,18 @@
 	if(istype(crayon, /obj/item/toy/crayon/spraycan))
 		var/obj/item/toy/crayon/spraycan/can = crayon
 		if(can.capped)
-			to_chat(user, "<span class='warning'>The cap is on [src] remove it first!</span>")
+			to_chat(user, "<span class='warning'>The cap is on the spray can remove it first!</span>")
 			return
 	if(pushed_over)
 		to_chat(user, "<span class='warning'>Right [src] first!</span>")
 		return
 	var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances
+	if(!Adjacent(usr))
+		user.visible_message("<span class='danger'>You need to be closer!</span>")
+		return
+	if(pushed_over)
+		to_chat(user, "<span class='warning'>Right [src] first!</span>")
+		return	
 	if(!new_appearance || !crayon)
 		return
 	if(!do_after(user, 10, FALSE, src, TRUE))

code/game/objects/items/control_wand.dm

@@ -118,6 +118,28 @@
 	icon_state = "gangtool-blue"
 	region_access = list(REGION_CENTCOMM)
 
+/obj/item/door_remote/omni/access_tuner
+	name = "access tuner"
+	desc = "A device used for illegally interfacing with doors."
+	icon_state = "hacktool"
+	item_state = "hacktool"
+	var/hack_speed = 30
+	var/busy = FALSE
+
+/obj/item/door_remote/omni/access_tuner/afterattack(obj/machinery/door/airlock/D, mob/user)
+	if(!istype(D))
+		return
+	if(busy)
+		to_chat(user, "<span class='warning'>[src] is alreading interfacing with a door!</span>")
+		return
+	icon_state = "hacktool-g"
+	busy = TRUE
+	to_chat(user, "<span class='notice'>[src] is attempting to interface with [D]...</span>")
+	if(do_after(user, hack_speed, target = D))
+		. = ..()
+	busy = FALSE
+	icon_state = "hacktool"
+
 #undef WAND_OPEN
 #undef WAND_BOLT
 #undef WAND_EMERGENCY

code/game/objects/items/devices/flashlight.dm

@@ -9,11 +9,11 @@
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=50, MAT_GLASS=20)
 	actions_types = list(/datum/action/item_action/toggle_light)
-	var/on = 0
+	var/on = FALSE
 	var/brightness_on = 4 //luminosity when on
 
 /obj/item/flashlight/Initialize()
-	..()
+	. = ..()
 	if(on)
 		icon_state = "[initial(icon_state)]-on"
 		set_light(brightness_on)
@@ -198,9 +198,10 @@ obj/item/flashlight/lamp/bananalamp
 
 	// Usual checks
 	if(!fuel)
-		to_chat(user, "<span class='notice'>It's out of fuel.</span>")
+		to_chat(user, "<span class='notice'>[src] is out of fuel.</span>")
 		return
 	if(on)
+		to_chat(user, "<span class='notice'>[src] is already on.</span>")
 		return
 
 	. = ..()
@@ -260,10 +261,11 @@ obj/item/flashlight/lamp/bananalamp
 
 /obj/item/flashlight/emp/process()
 	charge_tick++
-	if(charge_tick < 10) return 0
+	if(charge_tick < 10)
+		return FALSE
 	charge_tick = 0
 	emp_cur_charges = min(emp_cur_charges+1, emp_max_charges)
-	return 1
+	return TRUE
 
 /obj/item/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob)
 	if(on && user.zone_sel.selecting == "eyes") // call original attack proc only if aiming at the eyes
@@ -299,4 +301,101 @@ obj/item/flashlight/lamp/bananalamp
 	anchored = TRUE
 	var/range = null
 	unacidable = TRUE
-	burn_state = LAVA_PROOF
+	burn_state = LAVA_PROOF
+
+/obj/item/flashlight/glowstick
+	name = "green glowstick"
+	desc = "A military-grade glowstick."
+	w_class = WEIGHT_CLASS_SMALL
+	brightness_on = 4
+	color = LIGHT_COLOR_GREEN
+	icon_state = "glowstick"
+	item_state = "glowstick"
+	var/fuel = 0
+
+/obj/item/flashlight/glowstick/Initialize()
+	fuel = rand(1600, 2000)
+	light_color = color
+	. = ..()
+
+/obj/item/flashlight/glowstick/Destroy()
+	processing_objects.Remove(src)
+	. = ..()
+
+/obj/item/flashlight/glowstick/process()
+	fuel = max(fuel - 1, 0)
+	if(!fuel)
+		turn_off()
+		processing_objects.Remove(src)
+		update_icon()
+
+/obj/item/flashlight/glowstick/proc/turn_off()
+	on = FALSE
+	update_icon()
+
+/obj/item/flashlight/glowstick/update_icon()
+	item_state = "glowstick"
+	cut_overlays()
+	if(!fuel)
+		icon_state = "glowstick-empty"
+		cut_overlays()
+		update_brightness(0)
+	else if(on)
+		var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow")
+		glowstick_overlay.color = color
+		add_overlay(glowstick_overlay)
+		item_state = "glowstick-on"
+		update_brightness(brightness_on)
+	else
+		icon_state = "glowstick"
+		cut_overlays()
+
+/obj/item/flashlight/glowstick/attack_self(mob/user)
+	if(!fuel)
+		to_chat(user, "<span class='notice'>[src] is spent.</span>")
+		return
+	if(on)
+		to_chat(user, "<span class='notice'>[src] is already lit.</span>")
+		return
+
+	. = ..()
+	if(.)
+		user.visible_message("<span class='notice'>[user] cracks and shakes [src].</span>", "<span class='notice'>You crack and shake [src], turning it on!</span>")
+		activate()
+
+/obj/item/flashlight/glowstick/proc/activate()
+	if(!on)
+		on = TRUE
+		processing_objects.Add(src)
+		update_icon()
+
+/obj/item/flashlight/glowstick/red
+	name = "red glowstick"
+	color = LIGHT_COLOR_RED
+
+/obj/item/flashlight/glowstick/blue
+	name = "blue glowstick"
+	color = LIGHT_COLOR_BLUE
+
+/obj/item/flashlight/glowstick/orange
+	name = "orange glowstick"
+	color = LIGHT_COLOR_ORANGE
+
+/obj/item/flashlight/glowstick/yellow
+	name = "yellow glowstick"
+	color = LIGHT_COLOR_YELLOW
+
+/obj/item/flashlight/glowstick/pink
+	name = "pink glowstick"
+	color = LIGHT_COLOR_PINK
+
+/obj/item/flashlight/glowstick/random
+	name = "random colored glowstick"
+	icon_state = "random_glowstick"
+	color = null
+
+/obj/item/flashlight/glowstick/random/Initialize()
+	..()
+	var/T = pick(typesof(/obj/item/flashlight/glowstick) - /obj/item/flashlight/glowstick/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL

code/game/objects/items/robot/robot_upgrades.dm

@@ -207,7 +207,7 @@
 
 /obj/item/borg/upgrade/syndicate
 	name = "illegal equipment module"
-	desc = "Unlocks the hidden, deadlier functions of a cyborg"
+	desc = "Unlocks the hidden, deadlier functions of a cyborg. Also prevents emag subversion."
 	icon_state = "cyborg_upgrade3"
 	origin_tech = "combat=4;syndicate=1"
 	require_module = 1

code/game/objects/items/stacks/sheets/mineral.dm

@@ -220,6 +220,7 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
 	origin_tech = "materials=4"
 	sheettype = "tranquillite"
 	materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
+	wall_allowed = FALSE	//no tranquilite walls in code
 
 /obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
 	..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -174,7 +174,8 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
 	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
 	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
-	new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15)
+	new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),
+	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50)
 )
 
 /obj/item/stack/sheet/wood

code/game/objects/items/stacks/sheets/sheets.dm

@@ -13,6 +13,7 @@
 	var/full_window = null			//moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
 	usesound = 'sound/items/Deconstruct.ogg'
 	toolspeed = 1
+	var/wall_allowed = TRUE	//determines if sheet can be used in wall construction or not.
 
 
 // Since the sheetsnatcher was consolidated into weapon/storage/bag we now use

code/game/objects/items/weapons/cigs.dm

@@ -64,7 +64,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 /obj/item/clothing/mask/cigarette/fire_act()
 	light()
 
-/obj/item/clothing/mask/cigarette/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/clothing/mask/cigarette/attackby(obj/item/W as obj, mob/user as mob, mob/living/carbon/target, params)
 	..()
 	if(istype(W, /obj/item/weldingtool))
 		var/obj/item/weldingtool/WT = W
@@ -89,7 +89,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	else if(istype(W, /obj/item/melee/energy/sword/saber))
 		var/obj/item/melee/energy/sword/saber/S = W
 		if(S.active)
-			light("<span class='warning'>[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] in the process.</span>")
+			light("<span class='warning'>[user] makes a violent slashing motion, barely missing [user.p_their()] nose as light flashes. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] with [W] in the process.</span>")
 
 	else if(istype(W, /obj/item/assembly/igniter))
 		light("<span class='notice'>[user] fiddles with [W], and manages to light [user.p_their()] [name].</span>")
@@ -107,6 +107,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 
 	//can't think of any other way to update the overlays :<
 	user.update_inv_wear_mask()
+	target.update_inv_wear_mask()
 	user.update_inv_l_hand()
 	user.update_inv_r_hand()
 	return
@@ -195,7 +196,8 @@ LIGHTERS ARE IN LIGHTERS.DM
 	if(reagents && reagents.total_volume)	//	check if it has any reagents at all
 		if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
 			var/mob/living/carbon/C = loc
-			reagents.trans_to(C, REAGENTS_METABOLISM)
+			for (var/datum/reagent/R in reagents.reagent_list)
+				reagents.trans_to(C, REAGENTS_METABOLISM)
 			if(!reagents.total_volume) // There were reagents, but now they're gone
 				to_chat(C, "<span class='notice'>Your [name] loses its flavor.</span>")
 		else // else just remove some of the reagents
@@ -232,7 +234,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	throw_speed = 0.5
 	item_state = "spliffoff"
 	smoketime = 180
-	chem_volume = 50
+	chem_volume = 100
 
 /obj/item/clothing/mask/cigarette/rollie/New()
 	..()

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

@@ -168,7 +168,7 @@
 	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = WEIGHT_CLASS_NORMAL
 	w_class = WEIGHT_CLASS_TINY
-	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/ash_flora)
+	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora)
 	burn_state = FLAMMABLE
 
 /obj/item/storage/bag/plants/portaseeder

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

@@ -254,7 +254,7 @@
 	new /obj/item/grenade/flashbang(src)
 	new /obj/item/grenade/flashbang(src)
 	update_icon()
-	
+
 /obj/item/storage/belt/soulstone
 	name = "soul stone belt"
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
@@ -295,6 +295,13 @@
 	item_state = "military"
 	max_w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/storage/belt/military/traitor
+	name = "tool-belt"
+	desc = "Can hold various tools. This model seems to have additional compartments."
+	icon_state = "utilitybelt"
+	item_state = "utility"
+	use_item_overlays = 1 // So it will still show tools in it in case sec get lazy and just glance at it.
+
 /obj/item/storage/belt/military/abductor
 	name = "agent belt"
 	desc = "A belt used by abductor agents."

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

@@ -31,6 +31,10 @@
 		new /obj/item/flashlight/flare(src)
 	new /obj/item/radio(src)
 
+/obj/item/storage/toolbox/emergency/old
+	name = "rusty red toolbox"
+	icon_state = "toolbox_red_old"
+
 /obj/item/storage/toolbox/mechanical
 	name = "mechanical toolbox"
 	icon_state = "blue"
@@ -48,6 +52,10 @@
 /obj/item/storage/toolbox/mechanical/greytide
 	flags = NODROP
 
+/obj/item/storage/toolbox/mechanical/old
+	name = "rusty blue toolbox"
+	icon_state = "toolbox_blue_old"
+
 /obj/item/storage/toolbox/electrical
 	name = "electrical toolbox"
 	icon_state = "yellow"

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

@@ -87,24 +87,28 @@
 
 /obj/item/storage/box/syndie_kit/space
 	name = "Boxed Space Suit and Helmet"
-	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red)
+	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
 	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/box/syndie_kit/space/New()
 	..()
 	new /obj/item/clothing/suit/space/syndicate/black/red(src)
 	new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/tank/emergency_oxygen/syndi(src)
 	return
 
 /obj/item/storage/box/syndie_kit/hardsuit
 	name = "Boxed Blood Red Suit and Helmet"
-	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/clothing/head/helmet/space/hardsuit/syndi)
+	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/clothing/head/helmet/space/hardsuit/syndi, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
 	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/box/syndie_kit/hardsuit/New()
 	..()
 	new /obj/item/clothing/suit/space/hardsuit/syndi(src)
 	new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/tank/emergency_oxygen/syndi(src)
 	return
 
 /obj/item/storage/box/syndie_kit/elite_hardsuit

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -147,6 +147,12 @@
 	icon_state = "emergency_engi"
 	volume = 6
 
+/obj/item/tank/emergency_oxygen/syndi
+	name = "suspicious emergency oxygen tank"
+	icon_state = "emergency_syndi"
+	desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\""
+	volume = 6
+
 /obj/item/tank/emergency_oxygen/double
 	name = "double emergency oxygen tank"
 	icon_state = "emergency_double"