Merge branch 'master' into master

code/__DEFINES/__game.dm

@@ -31,7 +31,7 @@
 #define MAP_KUTJEVO "Kutjevo Refinery"
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
-#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
+#define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim"
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 

code/__DEFINES/mode.dm

@@ -57,7 +57,7 @@
 #define MODE_BASIC_RT (1<<11)
 #define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input..
 #define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects)
-#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses
+#define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses, increase armor bullet/bomb/internal damage protection
 
 // Gamemode Toggleable Flags
 #define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades

code/__DEFINES/tgs.dm

@@ -1,7 +1,7 @@
 // tgstation-server DMAPI
 // The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119.
 
-#define TGS_DMAPI_VERSION "7.2.1"
+#define TGS_DMAPI_VERSION "7.3.0"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/__HELPERS/unsorted.dm

@@ -46,8 +46,8 @@
 #define format_frequency(f) "[floor((f) / 10)].[(f) % 10]"
 
 #define reverse_direction(direction) ( \
-											( dir & (NORTH|SOUTH) ? ~dir & (NORTH|SOUTH) : 0 ) | \
-											( dir & (EAST|WEST) ? ~dir & (EAST|WEST) : 0 ) \
+											( direction & (NORTH|SOUTH) ? ~direction & (NORTH|SOUTH) : 0 ) | \
+											( direction & (EAST|WEST) ? ~direction & (EAST|WEST) : 0 ) \
 										)
 
 // The sane, counter-clockwise angle to turn to get from /direction/ A to /direction/ B

code/datums/decorators/gamemode_decorator.dm

@@ -44,3 +44,79 @@
 /datum/decorator/gamemode/decorate(atom/object)
 	for(var/edit in edits)
 		object.vars[edit] = edits[edit]
+
+//*********************** Human Versus Human ***********************//
+//************ USCM Armour Values ************//
+
+//**** Medium Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/medium, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Light Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/light, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_MEDIUM),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMLOW),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH)
+))
+
+//**** Heavy Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/heavy, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Smartgunner ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/smartgunner, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Military Police and Command ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/MP, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUMHIGH),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** B18 Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/specialist, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGHPLUS)
+))
+
+//**** Grenadier Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3G, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** RPG Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3T, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Scout Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M3S, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Sniper Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/ghillie, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//**** Pyro Spec Armor ****//
+GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/extended/faction_clash, list(
+	ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH),
+	ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM),
+	ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH)
+))
+
+//*********************** ------------------ ***********************//

code/datums/emergency_calls/emergency_call.dm

@@ -324,7 +324,7 @@
 
 
 	if(spawn_max_amount && i < mob_max)
-		for(var/c in i to mob_max)
+		for(var/c in i to mob_max - 1)
 			create_member(null, override_spawn_loc)
 
 	candidates = list()

code/datums/pain/_pain.dm

@@ -286,15 +286,20 @@
 /datum/pain/proc/oxyloss_drag(mob/living/source, mob/puller)
 	SIGNAL_HANDLER
 	if(isxeno(puller) && source.stat == UNCONSCIOUS)
+		var/mob/living/carbon/xenomorph/xeno_puller = puller
+		if(source.ally_of_hivenumber(xeno_puller.hivenumber))
+			return
 		if(source.get_species())
 			var/mob/living/carbon/human/H = source
 			if(H.species.flags & HAS_HARDCRIT)
 				source.apply_damage(20, OXY)
 
-/datum/pain/proc/handle_devour(mob/living/source)
+/datum/pain/proc/handle_devour(mob/living/source, mob/living/carbon/xenomorph/devourer)
 	SIGNAL_HANDLER
 	if(source.chestburst)
 		return
+	if(source.ally_of_hivenumber(devourer.hivenumber))
+		return
 	oxy_kill(source)
 	return COMPONENT_CANCEL_DEVOUR
 

code/game/jobs/job/civilians/other/liaison.dm

@@ -6,7 +6,7 @@
 	selection_class = "job_cl"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/liaison
-	entry_message_body = "As a <a href='"+WIKI_PLACEHOLDER+"'>representative of Weyland-Yutani Corporation</a>, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
+	entry_message_body = "As a <a href='"+WIKI_PLACEHOLDER+"'>representative of Weyland-Yutani Corporation</a>, your job requires you to stay in character at all times. While in the AO (Area of Operation), you are subject to orders given by military personnel. On ship, you are subject to orders only by the Command and Security departments. You are not required to follow any orders but you can be arrested if you do not. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
 	var/mob/living/carbon/human/active_liaison
 
 /datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status)

code/game/jobs/job/command/cic/executive.dm

@@ -18,7 +18,8 @@
 	GLOB.marine_leaders -= JOB_XO
 
 AddTimelock(/datum/job/command/executive, list(
-	JOB_COMMAND_ROLES = 5 HOURS,
+	JOB_COMMAND_ROLES = 20 HOURS,
+	JOB_SQUAD_LEADER = 10 HOURS,
 ))
 
 /obj/effect/landmark/start/executive

code/game/machinery/computer/groundside_operations.dm

@@ -113,7 +113,7 @@
 	if(show_command_squad)
 		dat += format_list_of_marines(list(GLOB.marine_leaders[JOB_CO], GLOB.marine_leaders[JOB_XO]) + GLOB.marine_leaders[JOB_SO], list(JOB_CO, JOB_XO, JOB_SO))
 	else if(current_squad)
-		dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE))
+		dat += format_list_of_marines(current_squad.marines_list, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE))
 	else
 		dat += "No Squad selected!<BR>"
 	dat += "<br><hr>"

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

@@ -4,7 +4,7 @@
 
 /obj/structure/machinery/cm_vending/sorted/cargo_guns
 	name = "\improper ColMarTech Automated Armaments Vendor"
-	desc = "An automated supply rack hooked up to a big storage of various firearms and explosives. Can be accessed by the Requisitions Officer and Cargo Techs."
+	desc = "An automated supply rack hooked up to a big storage of various firearms, explosives, load carrying equipment and other miscellaneous items. Can be accessed by the Quartermaster and Cargo Technicians."
 	icon_state = "req_guns"
 	req_access = list(ACCESS_MARINE_CARGO)
 	vendor_theme = VENDOR_THEME_USCM
@@ -224,7 +224,7 @@
 
 /obj/structure/machinery/cm_vending/sorted/cargo_ammo
 	name = "\improper ColMarTech Automated Munition Vendor"
-	desc = "An automated supply rack hooked up to a big storage of various ammunition types. Can be accessed by the Requisitions Officer and Cargo Techs."
+	desc = "An automated supply rack hooked up to a big storage of various ammunition types. Can be accessed by the Quartermaster and Cargo Technicians."
 	icon_state = "req_ammo"
 	req_access = list(ACCESS_MARINE_CARGO)
 	vendor_theme = VENDOR_THEME_USCM
@@ -367,7 +367,7 @@
 
 /obj/structure/machinery/cm_vending/sorted/attachments
 	name = "\improper Armat Systems Attachments Vendor"
-	desc = "An automated supply rack hooked up to a big storage of weapons attachments. Can be accessed by the Requisitions Officer and Cargo Techs."
+	desc = "An automated supply rack hooked up to a big storage of weapons attachments. Can be accessed by the Quartermaster and Cargo Technicians."
 	req_access = list(ACCESS_MARINE_CARGO)
 	vendor_theme = VENDOR_THEME_USCM
 	icon_state = "req_attach"
@@ -436,7 +436,7 @@
 
 /obj/structure/machinery/cm_vending/sorted/uniform_supply
 	name = "\improper ColMarTech Surplus Uniform Vendor"
-	desc = "An automated supply rack hooked up to a big storage of standard marine uniforms. Can be accessed by the Requisitions Officer and Cargo Techs."
+	desc = "An automated supply rack hooked up to a big storage of standard marine uniforms. Can be accessed by the Quartermaster and Cargo Technicians."
 	icon_state = "clothing"
 	req_access = list()
 	req_one_access = list(ACCESS_MARINE_CARGO)
@@ -466,7 +466,7 @@
 		list("ARMOR", -1, null, null),
 		list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
 		list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR),
-		list("M10 Pattern Corpman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
+		list("M10 Pattern Corpsman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
 		list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/carrier, VENDOR_ITEM_REGULAR),
 		list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padded, VENDOR_ITEM_REGULAR),
 		list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padless, VENDOR_ITEM_REGULAR),

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

@@ -166,7 +166,7 @@
 
 	var/mob/dead/observer/G = H.get_ghost()
 	if(istype(G) && G.client)
-		playsound_client(G.client, 'sound/effects/revive_notify.ogg')
+		playsound_client(G.client, 'sound/effects/adminhelp_new.ogg')
 		to_chat(G, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Someone is trying to revive your body. Return to it if you want to be resurrected! \
 			(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[G];reentercorpse=1'>click here!</a>)")))
 

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

@@ -762,6 +762,24 @@
 	storage_flags = STORAGE_FLAGS_BOX
 	display_maptext = FALSE
 
+/obj/item/storage/pill_bottle/packet/Initialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(try_forced_folding))
+
+/obj/item/storage/pill_bottle/packet/proc/try_forced_folding(datum/source, mob/user)
+	SIGNAL_HANDLER
+
+	if(!isturf(loc))
+		return
+
+	if(locate(/obj/item/reagent_container/pill) in src)
+		return
+
+	UnregisterSignal(src, COMSIG_ITEM_DROPPED)
+	storage_close(user)
+	to_chat(user, SPAN_NOTICE("You throw away [src]."))
+	qdel(src)
+
 /obj/item/storage/pill_bottle/packet/tricordrazine
 	name = "Tricordazine pill packet"
 	icon_state = "tricordrazine_packet"

code/game/objects/structures/barricade/non_folding.dm

@@ -290,6 +290,7 @@
 	force_level_absorption = 20
 	stack_type = /obj/item/stack/sheet/plasteel
 	debris = list(/obj/item/stack/sheet/plasteel)
+	stack_amount = 6
 	destroyed_stack_amount = 3
 	barricade_type = "new_plasteel"
 	repair_materials = list("plasteel" = 0.45)

code/modules/admin/admin_verbs.dm

@@ -142,7 +142,8 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list(
 	/client/proc/toggle_hardcore_perma,
 	/client/proc/toggle_bypass_joe_restriction,
 	/client/proc/toggle_joe_respawns,
-	/datum/admins/proc/open_shuttlepanel
+	/datum/admins/proc/open_shuttlepanel,
+	/client/proc/get_whitelisted_clients,
 ))
 
 GLOBAL_LIST_INIT(admin_verbs_major_event, list(

code/modules/admin/tabs/event_tab.dm

@@ -42,6 +42,23 @@
 
 	CEI.handle_event_info_update(faction)
 
+/client/proc/get_whitelisted_clients()
+	set name = "Find Whitelisted Players"
+	set category = "Admin.Events"
+	if(!admin_holder)
+		return
+
+	var/flag = tgui_input_list(src, "Which flag?", "Whitelist Flags", GLOB.bitfields["whitelist_status"])
+
+	var/list/ckeys = list()
+	for(var/client/test_client in GLOB.clients)
+		if(test_client.check_whitelist_status(GLOB.bitfields["whitelist_status"][flag]))
+			ckeys += test_client.ckey
+	if(!length(ckeys))
+		to_chat(src, SPAN_NOTICE("There are no players with that whitelist online"))
+		return
+	to_chat(src, SPAN_NOTICE("Whitelist holders: [ckeys.Join(", ")]."))
+
 /client/proc/change_security_level()
 	if(!check_rights(R_ADMIN))
 		return

code/modules/mob/living/carbon/human/say.dm

@@ -71,6 +71,9 @@
 
 	message = trim(strip_html(message))
 
+	if(!filter_message(src, message))
+		return
+
 	if(stat == DEAD)
 		return say_dead(message)
 
@@ -87,6 +90,10 @@
 		to_chat(src, SPAN_WARNING(fail_message))
 		return
 	message = parsed["message"]
+
+	if(!filter_message(src, message))
+		return
+
 	var/datum/language/speaking = parsed["language"]
 	if(!speaking)
 		speaking = get_default_language()

code/modules/mob/living/carbon/human/species/zombie.dm

@@ -127,7 +127,7 @@
 /datum/species/zombie/proc/handle_alert_ghost(mob/living/carbon/human/zombie)
 	var/mob/dead/observer/ghost = zombie.get_ghost()
 	if(ghost?.client)
-		playsound_client(ghost.client, 'sound/effects/revive_notify.ogg')
+		playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg')
 		to_chat(ghost, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Your body has risen! (Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)")))
 
 /datum/species/zombie/proc/remove_from_revive(mob/living/carbon/human/zombie)

code/modules/mob/living/carbon/xenomorph/castes/Queen.dm

@@ -413,6 +413,7 @@
 	hivenumber = XENO_HIVE_MUTATED
 
 /mob/living/carbon/xenomorph/queen/combat_ready
+	AUTOWIKI_SKIP(FALSE)
 	queen_aged = TRUE
 
 /mob/living/carbon/xenomorph/queen/Initialize()

code/modules/mob/living/say.dm

@@ -97,11 +97,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 /mob/living/say(message, datum/language/speaking = null, verb="says", alt_name="", italics=0, message_range = GLOB.world_view_size, sound/speech_sound, sound_vol, nolog = 0, message_mode = null, bubble_type = bubble_icon)
 	var/turf/T
 
-	if(SEND_SIGNAL(src, COMSIG_LIVING_SPEAK, message, speaking, verb, alt_name, italics, message_range, speech_sound, sound_vol, nolog, message_mode) & COMPONENT_OVERRIDE_SPEAK) return
-
 	if(!filter_message(src, message))
 		return
 
+	if(SEND_SIGNAL(src, COMSIG_LIVING_SPEAK, message, speaking, verb, alt_name, italics, message_range, speech_sound, sound_vol, nolog, message_mode) & COMPONENT_OVERRIDE_SPEAK) return
+
 	message = process_chat_markup(message, list("~", "_"))
 
 	for(var/dst=0; dst<=1; dst++) //Will run twice if src has a clone

code/modules/nightmare/nmnodes/mapload.dm

@@ -94,7 +94,7 @@
 	. = ..()
 	if(!.) return
 	var/dir_path = context.get_file_path(filepath, "map")
-	var/regex/matcher = new(@"^([0-9]+)([\.\+])(([^_]+)(_.*))?\.dmm$", "i")
+	var/regex/matcher = new(@"^([0-9]+)([\.\+])(([^_]+)(.*))?\.dmm$", "i")
 	var/list/dircontents = flist(dir_path)
 	for(var/filename in dircontents)
 		if(!matcher.Find(filename))

code/modules/reagents/chemistry_properties/prop_positive.dm

@@ -603,7 +603,7 @@
 		var/mob/dead/observer/ghost = dead.get_ghost()
 		if(ghost?.client)
 			COOLDOWN_START(src, ghost_notif, 30 SECONDS)
-			playsound_client(ghost.client, 'sound/effects/revive_notify.ogg')
+			playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg')
 			to_chat(ghost, SPAN_BOLDNOTICE("Your heart is struggling to pump! There is a chance you might get up!(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)"))
 	return TRUE
 

code/modules/shuttle/shuttles/crashable/escape_shuttle.dm

@@ -78,11 +78,11 @@
 			cryos += list(cryotube)
 	if (occupant_count > max_capacity)
 		playsound(src,'sound/effects/escape_pod_warmup.ogg', 50, 1)
+		mode = SHUTTLE_CRASHED
 		sleep(31)
 		var/turf/sploded = return_center_turf()
 		cell_explosion(sploded, 100, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("escape pod malfunction")) //Clears out walls
 		sleep(25)
-		mode = SHUTTLE_CRASHED
 		for(var/obj/structure/machinery/cryopod/evacuation/cryotube in cryos)
 			cryotube.go_out()
 		door_handler.control_doors("force-unlock")