Merge branch 'master' into double-light-removal

code/__DEFINES/text.dm

@@ -23,4 +23,4 @@
 #define MAX_EMOTE_LEN 256
 #define MAX_PAPER_MESSAGE_LEN 3072
 #define MAX_BOOK_MESSAGE_LEN 9216
-#define MAX_NAME_LEN 26
+#define MAX_NAME_LEN 28

code/game/machinery/vending/vending_types.dm

@@ -267,6 +267,7 @@
 		/obj/item/ammo_magazine/rifle/rubber = 40,
 		/obj/item/ammo_magazine/rifle/m4ra/rubber = 40,
 		/obj/item/clothing/head/helmet/marine/MP = 8,
+		/obj/item/explosive/plastic/breaching_charge/rubber = 6,
 	)
 
 /obj/structure/machinery/vending/sea

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -190,6 +190,11 @@
 		list("Falling Falcons Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR),
 		list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR),
 		list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
+
+		list("OPTICS", -1, null, null, null),
+		list("Advanced Medical Optic (CORPSMAN ONLY)", round(scale * 4), /obj/item/device/helmet_visor/medical/advanced, VENDOR_ITEM_REGULAR),
+		list("Squad Optic", round(scale * 15), /obj/item/device/helmet_visor, VENDOR_ITEM_REGULAR),
+
 		)
 
 //--------------SQUAD SPECIFIC VERSIONS--------------

code/game/objects/effects/acid_hole.dm

@@ -40,7 +40,7 @@
 
 
 /obj/effect/acid_hole/attack_alien(mob/living/carbon/xenomorph/user)
-	if (!holed_wall)
+	if(!holed_wall)
 		qdel(src) //no wall?! then cease existence...
 		return
 
@@ -49,6 +49,9 @@
 			expand_hole(user)
 			return XENO_NO_DELAY_ACTION
 
+/obj/effect/acid_hole/attack_larva(mob/living/carbon/xenomorph/larva/M)
+	attack_alien(M)
+
 /obj/effect/acid_hole/proc/expand_hole(mob/living/carbon/xenomorph/user)
 	if(user.action_busy || user.is_mob_incapacitated())
 		return

code/game/objects/items/explosives/plastic.dm

@@ -321,6 +321,8 @@
 	penetration = 0.60
 	deploying_time = 10
 	var/shrapnel_volume = 40
+	var/shrapnel_type = /datum/ammo/bullet/shrapnel/metal
+	var/explosion_strength = 60
 
 /obj/item/explosive/plastic/breaching_charge/can_place(mob/user, atom/target)
 	if(!is_type_in_list(target, breachable))//only items on the list are allowed
@@ -347,13 +349,21 @@
 
 /obj/item/explosive/plastic/breaching_charge/handle_explosion(turf/target_turf, dir, cause_data)
 	var/explosion_target = get_step(target_turf, dir)
-	create_shrapnel(explosion_target, shrapnel_volume, dir, angle,/datum/ammo/bullet/shrapnel/metal, cause_data)
+	create_shrapnel(explosion_target, shrapnel_volume, dir, angle, shrapnel_type, cause_data)
 	addtimer(CALLBACK(src, PROC_REF(trigger_explosion), target_turf, dir, cause_data), 1)
 
 /obj/item/explosive/plastic/breaching_charge/proc/trigger_explosion(turf/target_turf, dir, cause_data)
-	cell_explosion(target_turf, 60, 60, EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL, dir, cause_data)
+	cell_explosion(target_turf, explosion_strength, explosion_strength, EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL, dir, cause_data)
 	qdel(src)
 
+/obj/item/explosive/plastic/breaching_charge/rubber
+	name = "X17 riot charge"
+	desc = "An explosive device used to break into areas while protecting the user from the blast. Unlike the standard breaching charge, the X17 deploys a cone spray of rubber pellets to incapacitate rather than kill."
+	icon_state = "riot-charge"
+	overlay_image = "riot-active"
+	shrapnel_volume = 20
+	shrapnel_type = /datum/ammo/bullet/shrapnel/rubber
+
 /obj/item/explosive/plastic/breaching_charge/plasma
 	name = "plasma charge"
 	desc = "An alien explosive device. Who knows what it might do."
@@ -367,18 +377,12 @@
 	deploying_time = 10
 	flags_item = NOBLUDGEON|ITEM_PREDATOR
 	shrapnel_volume = 10
+	shrapnel_type = /datum/ammo/bullet/shrapnel/plasma
+	explosion_strength = 90
 
 /obj/item/explosive/plastic/breaching_charge/plasma/can_place(mob/user, atom/target)
 	if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH))
 		to_chat(user, SPAN_WARNING("You don't quite understand how the device works..."))
 		return FALSE
 	. = ..()
 
-/obj/item/explosive/plastic/breaching_charge/plasma/handle_explosion(turf/target_turf, dir, cause_data)
-	var/explosion_target = get_step(target_turf, dir)
-	create_shrapnel(explosion_target, shrapnel_volume, dir, angle,/datum/ammo/bullet/shrapnel/plasma, cause_data)
-	addtimer(CALLBACK(src, PROC_REF(trigger_explosion), target_turf, dir, cause_data), 1)
-
-/obj/item/explosive/plastic/breaching_charge/plasma/trigger_explosion(turf/target_turf, dir, cause_data)
-	cell_explosion(target_turf, 90, 90, EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL, dir, cause_data)
-	qdel(src)

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

@@ -71,7 +71,7 @@
 	var/obj/item/stack/flag/newflag = new src.type(T)
 	newflag.amount = 1
 	newflag.upright = TRUE
-	anchored = TRUE
+	newflag.anchored = TRUE
 	newflag.name = newflag.singular_name
 	newflag.icon_state = "[newflag.base_state]_open"
 	newflag.visible_message("<b>[user]</b> plants [newflag] firmly in the ground.")

code/game/objects/items/tools/flame_tools.dm

@@ -721,6 +721,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 		log_admin("[user] has engraved \the [src] with engraving \"[str]\". (CKEY: ([user.ckey]))")
 
+/obj/item/tool/lighter/zippo/black
+	name = "black Zippo lighter"
+	desc = "A fancy black Zippo lighter. Ignite in style."
+	icon_state = "blackzippo"
+	item_state = "blackzippo"
+	icon_on = "blackzippoon"
+	icon_off = "blackzippo"
+
+/obj/item/tool/lighter/zippo/blue
+	name = "blue Zippo lighter"
+	desc = "A fancy blue Zippo lighter. Ignite in style."
+	icon_state = "bluezippo"
+	item_state = "bluezippo"
+	icon_on = "bluezippoon"
+	icon_off = "bluezippo"
+
 /obj/item/tool/lighter/zippo/gold
 	name = "golden Zippo lighter"
 	desc = "A gold-anodized Zippo lighter. Ostentatious, but it certainly stands out."
@@ -730,6 +746,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon_off = "goldzippo"
 	black_market_value = 30
 
+/obj/item/tool/lighter/zippo/executive
+	name = "Weyland-Yutani executive Zippo lighter"
+	desc = "A remarkable Zippo lighter embellished in the Company's black and gold shade."
+	icon_state = "execzippo"
+	item_state = "execzippo"
+	icon_on = "execzippoon"
+	icon_off = "execzippo"
+	black_market_value = 40
+
 /obj/item/tool/lighter/random
 
 /obj/item/tool/lighter/random/Initialize()

code/game/objects/items/tools/misc_tools.dm

@@ -161,7 +161,7 @@
 	matter = list("metal" = 10)
 	inherent_traits = list(TRAIT_TOOL_PEN)
 	/// what color the ink is!
-	var/pen_colour = "black"
+	var/pen_color = "black"
 	var/on = TRUE
 	var/clicky = FALSE
 
@@ -180,7 +180,7 @@
 /obj/item/tool/pen/proc/update_pen_state()
 	overlays.Cut()
 	if(on)
-		overlays += "+[pen_colour]_tip"
+		overlays += "+[pen_color]_tip"
 
 /obj/item/tool/pen/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
@@ -246,7 +246,7 @@
 
 /obj/item/tool/pen/blue
 	desc = "It's a normal blue ink pen."
-	pen_colour = "blue"
+	pen_color = "blue"
 
 /obj/item/tool/pen/blue/clicky
 	desc = "It's a WY brand extra clicky blue ink pen."
@@ -255,7 +255,7 @@
 
 /obj/item/tool/pen/red
 	desc = "It's a normal red ink pen."
-	pen_colour = "red"
+	pen_color = "red"
 
 /obj/item/tool/pen/red/clicky
 	desc = "It's a WY brand extra clicky red ink pen."
@@ -264,7 +264,7 @@
 
 /obj/item/tool/pen/green
 	desc = "It's a normal green ink pen."
-	pen_colour = "green"
+	pen_color = "green"
 
 /obj/item/tool/pen/green/clicky
 	desc = "It's a WY brand extra clicky green ink pen."
@@ -273,7 +273,7 @@
 
 /obj/item/tool/pen/invisible
 	desc = "It's an invisible pen marker."
-	pen_colour = "white"
+	pen_color = "white"
 
 /obj/item/tool/pen/fountain
 	desc = "A lavish testament to the ingenuity of ARMAT's craftsmanship, this fountain pen is a paragon of design and functionality. Detailed with golden accents and intricate mechanics, the pen allows for a swift change between a myriad of ink colors with a simple twist. A product of precision engineering, each mechanism inside the pen is designed to provide a seamless, effortless transition from one color to the next, creating an instrument of luxurious versatility."
@@ -282,8 +282,8 @@
 	icon_state = "fountain_pen"
 	item_state = "fountain_pen"
 	matter = list("metal" = 20, "gold" = 10)
-	var/static/list/colour_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required
-	var/current_colour_index = 1
+	var/static/list/color_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required
+	var/current_color_index = 1
 	var/owner_name
 
 /obj/item/tool/pen/fountain/pickup(mob/user, silent)
@@ -305,9 +305,9 @@
 
 /obj/item/tool/pen/fountain/attack_self(mob/living/carbon/human/user)
 	if(on)
-		current_colour_index = (current_colour_index % length(colour_list)) + 1
-		pen_colour = colour_list[current_colour_index]
-		balloon_alert(user,"you twist the pen and change the ink color to [pen_colour].")
+		current_color_index = (current_color_index % length(color_list)) + 1
+		pen_color = color_list[current_color_index]
+		balloon_alert(user,"you twist the pen and change the ink color to [pen_color].")
 		if(clicky)
 			playsound(user.loc, 'sound/items/pen_click_on.ogg', 100, 1, 5)
 		update_pen_state()

code/modules/admin/view_variables/get_variables.dm

@@ -121,12 +121,12 @@
 
 	switch(.["class"])
 		if(VV_TEXT)
-			.["value"] = tgui_input_text(usr, "Enter new text:", "Text", current_value, encode = FALSE)
+			.["value"] = tgui_input_text(usr, "Enter new text:", "Text", current_value, encode = FALSE, trim = FALSE)
 			if(.["value"] == null)
 				.["class"] = null
 				return
 		if(VV_MESSAGE)
-			.["value"] = tgui_input_text(usr, "Enter new text:", "Text", current_value, encode = FALSE)
+			.["value"] = tgui_input_text(usr, "Enter new text:", "Text", current_value, encode = FALSE, trim = FALSE)
 			if(.["value"] == null)
 				.["class"] = null
 				return

code/modules/client/preferences_gear.dm

@@ -863,6 +863,14 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	display_name = "Lighter, zippo"
 	path = /obj/item/tool/lighter/zippo
 
+/datum/gear/smoking/zippo/black
+	display_name = "Black lighter, zippo"
+	path = /obj/item/tool/lighter/zippo/black
+
+/datum/gear/smoking/zippo/blue
+	display_name = "Blue lighter, zippo"
+	path = /obj/item/tool/lighter/zippo/blue
+
 /datum/gear/smoking/electronic_cigarette
 	display_name = "Electronic cigarette"
 	path = /obj/item/clothing/mask/electronic_cigarette
@@ -891,7 +899,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 /datum/gear/misc/facepaint_skull
 	display_name = "Facepaint, skull"
 	path = /obj/item/facepaint/skull
-	cost = 3 
+	cost = 3
 
 /datum/gear/misc/facepaint_body
 	display_name = "Fullbody paint"

code/modules/cm_marines/Donator_Items.dm

@@ -421,12 +421,12 @@
 	item_state = "merc_armor"
 
 /obj/item/clothing/suit/storage/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
-	name = "M4X Armor"
-	desc = "Armor to the M4X!!!!  DONOR ITEM"
+	name = "M4-X Armor"
+	desc = "A next generation body armor system intended for Marines fighting against xenomorphs, the system is coated in a unique acid resistant polymer coating, as well as enhanced ballistics protection. This prototype version lacks those two features. DONOR ITEM"
+	flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
 	icon_state = "steelpoint_armor"
 	item_state = "steelpoint_armor"
 
-
 /obj/item/clothing/suit/storage/marine/fluff/valentine //CKEY=markvalentine
 	name = "Shocky's Armor"
 	desc = "Shockingly good armor.   DONOR ITEM"
@@ -842,10 +842,11 @@
 	flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR
 
 /obj/item/clothing/head/helmet/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
-	name = "M4X Helmet"
-	desc = "Helmets to the M4X!!!  DONOR ITEM"
+	name = "M4-X Helmet"
+	desc = "A next generation combat helmet intended to be paired with the M4-X armor. The full faced helmet provides complete light ballistic-resistant protection alongside enchanced acid resistance. This prototype version lacks those features. DONOR ITEM"
 	icon_state = "steelpoint_helmet"
 	item_state = "steelpoint_helmet"
+	flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
 	flags_inventory = BLOCKSHARPOBJ
 	flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR
 
@@ -1148,8 +1149,8 @@
 	flags_jumpsuit = FALSE
 
 /obj/item/clothing/under/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
-	name = "M4X Jumpsuit"
-	desc = "Jumpsuit to the M4X!!!  DONOR ITEM"
+	name = "M4-X Jumpsuit"
+	desc = "Jumpsuit issued alongside the M4-X armor. Considered outdated compared to the more modern armor system.  DONOR ITEM"
 	icon_state = "steelpoint_jumpsuit"
 	worn_state = "steelpoint_jumpsuit"
 	flags_jumpsuit = FALSE
@@ -1319,10 +1320,10 @@
 	item_state = "doom_boots"
 
 /obj/item/clothing/shoes/marine/fluff/steelpoint //CKEY=steelpoint (UNIQUE)
-	name = "M4X Boot"
-	desc = "Boots to the M4X.  DONOR ITEM"
-	icon_state = "jackboots"
-	item_state = "jackboots"
+	name = "M4-X Boot"
+	desc = "Standard issue boots issued alongside M4-X armor, features a special coating of acid-resistant layering to allow its operator to move through acid-dretched enviroments safely. This prototype version lacks that feature.  DONOR ITEM"
+	icon_state = "marine"
+	item_state = "marine"
 
 //GENERIC GLASSES, GLOVES, AND MISC ////////////////////
 

code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm

@@ -1,9 +1,9 @@
 
-/datum/equipment_preset/survivor/scientist/florina
-	name = "Survivor - Florina Researcher"
-	assignment = "Florina Researcher"
+/datum/equipment_preset/survivor/scientist/fiorina
+	name = "Survivor - Fiorina Researcher"
+	assignment = "Fiorina Researcher"
 
-/datum/equipment_preset/survivor/scientist/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/scientist/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(new_human), WEAR_JACKET)
@@ -15,20 +15,20 @@
 	..()
 
 
-/datum/equipment_preset/survivor/doctor/florina
-	name = "Survivor - Florina Doctor"
-	assignment = "Florina Doctor"
+/datum/equipment_preset/survivor/doctor/fiorina
+	name = "Survivor - Fiorina Doctor"
+	assignment = "Fiorina Doctor"
 
-/datum/equipment_preset/survivor/doctor/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/doctor/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
 	..()
 
-/datum/equipment_preset/survivor/security/florina
-	name = "Survivor - Florina Prison Guard"
-	assignment = "Florina Prison Guard"
+/datum/equipment_preset/survivor/security/fiorina
+	name = "Survivor - Fiorina Prison Guard"
+	assignment = "Fiorina Prison Guard"
 
-/datum/equipment_preset/survivor/security/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/security/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
@@ -37,11 +37,11 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
 	..()
 
-/datum/equipment_preset/survivor/colonial_marshal/florina
+/datum/equipment_preset/survivor/colonial_marshal/fiorina
 	name = "Survivor - United Americas Riot Officer"
 	assignment = "United Americas Riot Officer"
 
-/datum/equipment_preset/survivor/colonial_marshal/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET)
@@ -52,11 +52,11 @@
 
 	..()
 
-/datum/equipment_preset/survivor/engineer/florina
-	name = "Survivor - Florina Engineer"
-	assignment = "Florina Engineer"
+/datum/equipment_preset/survivor/engineer/fiorina
+	name = "Survivor - Fiorina Engineer"
+	assignment = "Fiorina Engineer"
 
-/datum/equipment_preset/survivor/engineer/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/engineer/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)