Merge remote-tracking branch 'cmss13-devs/master'

code/__DEFINES/camera.dm

@@ -6,6 +6,7 @@
 #define CAMERA_NET_BRIG "Brig"
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
+#define CAMERA_NET_SAIPAN "Saipan"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

code/__DEFINES/job.dm

@@ -264,6 +264,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UPP_SPECIALIST "UPP Serzhant"
 #define JOB_UPP_LEADER "UPP Master Serzhant"
 #define JOB_UPP_POLICE "UPP Politsiya"
+#define JOB_UPP_SUPPLY "UPP Logistics Technician"
 #define JOB_UPP_LT_OFFICER "UPP Leytenant"
 #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
 #define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
@@ -291,6 +292,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define JOB_UPP_CREWMAN "UPP Tank Crewman"
 
+#define JOB_UPP_COMMISSAR "UPP Political Commissar"
+
 //-------- CLF --------//
 #define JOB_CLF "CLF Guerilla"
 #define JOB_CLF_ENGI "CLF Field Technician"

code/__DEFINES/paygrade_defs/upp.dm

@@ -43,6 +43,9 @@
 /// UO4, Mayjor
 #define PAY_SHORT_UO4 "UO4"
 
+/// UO4P, Political Commissar
+#define PAY_SHORT_UO4P "UO4P"
+
 /// UO5, Leytenant Kolonel
 #define PAY_SHORT_UO5 "UO5"
 

code/__DEFINES/radio.dm

@@ -33,6 +33,7 @@
 #define RADIO_CHANNEL_MEDSCI "MedSci"
 #define RADIO_CHANNEL_MP "MP"
 #define RADIO_CHANNEL_NORMANDY "Normandy"
+#define RADIO_CHANNEL_SAIPAN "Saipan"
 #define RADIO_CHANNEL_REQ "Req"
 #define RADIO_CHANNEL_SENTRY "Sentry Network"
 #define RADIO_CHANNEL_SPECIAL "special"

code/__DEFINES/shuttles.dm

@@ -113,6 +113,7 @@
 
 #define DROPSHIP_ALAMO "dropship_alamo"
 #define DROPSHIP_NORMANDY "dropship_normandy"
+#define DROPSHIP_SAIPAN "dropship_saipan"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"

code/_globalvars/bitfields.dm

@@ -177,6 +177,8 @@ DEFINE_BITFIELD(flags_item, list(
 	"CAN_DIG_SHRAPNEL" = CAN_DIG_SHRAPNEL,
 	"ANIMATED_SURGICAL_TOOL" = ANIMATED_SURGICAL_TOOL,
 	"IGNITING_ITEM" = IGNITING_ITEM,
+	"FORCEDROP_CONDITIONAL" = FORCEDROP_CONDITIONAL,
+	"SMARTGUNNER_BACKPACK_OVERRIDE" = SMARTGUNNER_BACKPACK_OVERRIDE,
 ))
 
 DEFINE_BITFIELD(flags_inv_hide, list(

code/controllers/configuration/configuration.dm

@@ -19,7 +19,7 @@
 	var/motd
 	var/policy
 
-	var/static/regex/ic_filter_regex
+	var/static/regex/word_filter_regex
 
 	var/is_loaded = FALSE
 
@@ -315,21 +315,21 @@
 
 
 /datum/controller/configuration/proc/LoadChatFilter()
-	var/list/in_character_filter = list()
+	var/list/word_filter = list()
 
-	if(!fexists("[directory]/in_character_filter.txt"))
+	if(!fexists("[directory]/word_filter.txt"))
 		return
 
-	log_config("Loading config file in_character_filter.txt...")
+	log_config("Loading config file word_filter.txt...")
 
-	for(var/line in file2list("[directory]/in_character_filter.txt"))
+	for(var/line in file2list("[directory]/word_filter.txt"))
 		if(!line)
 			continue
 		if(findtextEx(line,"#",1,2))
 			continue
-		in_character_filter += REGEX_QUOTE(line)
+		word_filter += REGEX_QUOTE(line)
 
-	ic_filter_regex = length(in_character_filter) ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
+	word_filter_regex = length(word_filter) ? regex("\\b([jointext(word_filter, "|")])\\b", "i") : null
 
 //Message admins when you can.
 /datum/controller/configuration/proc/DelayedMessageAdmins(text)

code/controllers/subsystem/communications.dm

@@ -129,6 +129,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 
 #define DS1_FREQ 1488
 #define DS2_FREQ 1489
+#define DS3_FREQ 1490
 
 //Marine Squad channels
 #define ALPHA_FREQ 1491
@@ -176,6 +177,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 
 	RADIO_CHANNEL_ALAMO = DS1_FREQ,
 	RADIO_CHANNEL_NORMANDY = DS2_FREQ,
+	RADIO_CHANNEL_SAIPAN = DS3_FREQ,
 
 	RADIO_CHANNEL_COLONY = COLONY_FREQ,
 

code/datums/ASRS.dm

@@ -40,6 +40,10 @@
 	reference_package = /datum/supply_packs/ammo_m4a3_mag_box_ap
 	cost = ASRS_VERY_LOW_WEIGHT
 
+/datum/supply_packs_asrs/ammo_m4a3_mag_box_hp
+	reference_package = /datum/supply_packs/ammo_m4a3_mag_box_hp
+	cost = ASRS_VERY_LOW_WEIGHT
+
 /datum/supply_packs_asrs/ammo_mag_box
 	reference_package = /datum/supply_packs/ammo_mag_box
 	cost = ASRS_VERY_LOW_WEIGHT
@@ -123,3 +127,4 @@
 /datum/supply_packs_asrs/ingredient
 	reference_package = /datum/supply_packs/ingredient
 	pool = ASRS_POOL_FOOD
+	cost = ASRS_VERY_LOW_WEIGHT

code/datums/factions/upp.dm

@@ -53,6 +53,10 @@
 			hud_icon_state = "vc"
 		if(JOB_UPP_LT_DOKTOR)
 			hud_icon_state = "doc"
+		if(JOB_UPP_SUPPLY)
+			hud_icon_state = "log"
+		if(JOB_UPP_COMMISSAR)
+			hud_icon_state = "commi"
 	if(hud_icon_state)
 		holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]")
 

code/datums/paygrades/factions/upp/upp.dm

@@ -95,6 +95,13 @@
 	pay_multiplier = 2.5
 	officer_grade = GRADE_OFFICER
 
+/datum/paygrade/upp/uo4p
+	paygrade = PAY_SHORT_UO4P
+	name = "Political Commissar"
+	prefix = "Pol."
+	pay_multiplier = 5
+	officer_grade = GRADE_OFFICER
+
 /datum/paygrade/upp/uo5
 	paygrade = PAY_SHORT_UO5
 	name = "Leytenant Kolonel"

code/datums/skills/upp.dm

@@ -83,6 +83,34 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 	)
 
+/datum/skills/upp/logistics_technician
+	name = "UPP Logistics Technician"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+	)
+
+/datum/skills/upp/commissar
+	name = "UPP Starshy Politruk"
+	skills = list(
+		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+		SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
+		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
+		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
+		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
+		SKILL_INTEL = SKILL_INTEL_EXPERT,
+	)
+
 /datum/skills/upp/officer
 	name = "UPP Officer"
 	skills = list(

code/datums/supply_packs/ammo.dm

@@ -291,7 +291,7 @@
 	)
 	name = "M41AE2 HPR Magazines crate (HPR ammo box x2)"
 	cost = 20
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ammo
 	containername = "\improper M41AE2 HPR magazines crate"
 	group = "Ammo"
 
@@ -301,8 +301,8 @@
 		/obj/item/ammo_magazine/rifle/lmg/holo_target,
 	)
 	name = "M41AE2 HPR Holo-Target Magazines crate (HPR HT ammo box x2)"
-	cost = 30
-	containertype = /obj/structure/closet/crate
+	cost = 20
+	containertype = /obj/structure/closet/crate/ammo
 	containername = "\improper M41AE2 HPR holo-target magazines crate"
 	group = "Ammo"
 

code/datums/supply_packs/explosives.dm

@@ -111,25 +111,25 @@
 	containername = "\improper explosive HEDP grenade crate (WARNING)"
 	group = "Explosives"
 
-/datum/supply_packs/explosives_M40_HPDP
-	name = "M40 HPDP white phosphorus grenades crate (x6)"
+/datum/supply_packs/explosives_M40_CCDP
+	name = "M40 CCDP chemical compound grenades crate (x6)"
 	contains = list(
 		/obj/item/storage/box/packet/phosphorus,
 		/obj/item/storage/box/packet/phosphorus,
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/explosives
-	containername = "\improper M40 HPDP grenade crate (WARNING)"
+	containername = "\improper M40 CCDP grenade crate (WARNING)"
 	group = "Explosives"
 
-/datum/supply_packs/explosives_M40_HPDP_crate
-	name = "M40 HPDP white phosphorus grenade box crate (x25)"
+/datum/supply_packs/explosives_M40_CCDP_crate
+	name = "M40 WPDP chemical compund grenade box crate (x25)"
 	contains = list(
 		/obj/item/storage/box/nade_box/phophorus,
 	)
 	cost = 100
 	containertype = /obj/structure/closet/crate/explosives
-	containername = "\improper HPDP grenade crate (WARNING)"
+	containername = "\improper CCDP grenade crate (WARNING)"
 	group = "Explosives"
 
 /datum/supply_packs/explosives_M40_HEFA
@@ -186,6 +186,16 @@
 	containername = "\improper explosive M74 AGM-I grenades crate (WARNING)"
 	group = "Explosives"
 
+/datum/supply_packs/explosives_M74_AGM_I_box
+	name = "M74 Airburst Grenade Munition incendiary grenades box crate (x25)"
+	contains = list(
+		/obj/item/storage/box/nade_box/airburstincen,
+	)
+	cost = 100
+	containertype = /obj/structure/closet/crate/explosives
+	containername = "\improper M74 Airburst Grenade Munition incendiary grenades crate (WARNING)"
+	group = "Explosives"
+
 /datum/supply_packs/explosives_airburst_smoke
 	name = "M74 Airburst Grenade Munition smoke grenades crate (x6)"
 	contains = list(

code/datums/supply_packs/mortar.dm

@@ -72,3 +72,18 @@
 	containertype = /obj/structure/closet/crate/secure/mortar_ammo
 	containername = "\improper M402 mortar flare shells crate"
 	group = "Mortar"
+
+/datum/supply_packs/ammo_mortar_frag
+	name = "M402 mortar shells crate (x6 Frag)"
+	cost = 20
+	contains = list(
+		/obj/item/mortar_shell/frag,
+		/obj/item/mortar_shell/frag,
+		/obj/item/mortar_shell/frag,
+		/obj/item/mortar_shell/frag,
+		/obj/item/mortar_shell/frag,
+		/obj/item/mortar_shell/frag,
+	)
+	containertype = /obj/structure/closet/crate/secure/mortar_ammo
+	containername = "\improper M402 mortar frag shells crate"
+	group = "Mortar"

code/game/area/Sulaco.dm

@@ -115,7 +115,58 @@
 	icon_state = "away2"
 
 
+/area/shuttle/drop2/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+/area/shuttle/drop3
+	//soundscape_playlist = list('sound/soundscape/drum1.ogg')
+	soundscape_interval = 30 //seconds
+	is_resin_allowed = FALSE
+	flags_area = AREA_NOTUNNEL
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+	base_lighting_alpha = 0
+
+/area/shuttle/drop3/sulaco
+	name = "\improper Dropship Saipan"
+	icon_state = "shuttle"
+	base_muffle = MUFFLE_HIGH
+	base_lighting_alpha = 255
+
+/area/shuttle/drop3/LV624
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_LV624
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/prison
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_PRISON
+	icon_state = "shuttle2"
 
+/area/shuttle/drop3/BigRed
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_BIGRED
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/ice_colony
+	name = "\improper Dropship Saipan"
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/DesertDam
+	name = "\improper Dropship Saipan"
+	ambience_exterior = AMBIENCE_TRIJENT
+	icon_state = "shuttle2"
+
+/area/shuttle/drop3/transit
+	ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg'
+	name = "\improper Dropship Saipan Transit"
+	icon_state = "shuttlered"
+
+/area/shuttle/drop3/lz3
+	name = "\improper Saipan Landing Zone"
+	icon_state = "away2"
 
 
 //DISTRESS SHUTTLES

code/game/gamemodes/colonialmarines/whiskey_outpost.dm

@@ -614,6 +614,7 @@
 		"Explosives and grenades",
 		"Rocket ammo",
 		"Sniper ammo",
+		"Anti-Material Sniper ammo",
 		"Pyrotechnician tanks",
 		"Scout ammo",
 		"Smartgun ammo",
@@ -634,14 +635,17 @@
 		if("Sniper ammo")
 			supply_drop = 3
 			to_chat(usr, SPAN_NOTICE("Sniper ammo will now drop!"))
-		if("Explosives and grenades")
+		if("Anti-Material Sniper ammo")
 			supply_drop = 4
+			to_chat(usr, SPAN_NOTICE("Anti-Material Sniper ammo will now drop!"))
+		if("Explosives and grenades")
+			supply_drop = 5
 			to_chat(usr, SPAN_NOTICE("Explosives and grenades will now drop!"))
 		if("Pyrotechnician tanks")
-			supply_drop = 5
+			supply_drop = 6
 			to_chat(usr, SPAN_NOTICE("Pyrotechnician tanks will now drop!"))
 		if("Scout ammo")
-			supply_drop = 6
+			supply_drop = 7
 			to_chat(usr, SPAN_NOTICE("Scout ammo will now drop!"))
 		else
 			return
@@ -734,15 +738,21 @@
 							/obj/item/ammo_magazine/sniper,
 							/obj/item/ammo_magazine/sniper/incendiary,
 							/obj/item/ammo_magazine/sniper/flak)
-		if(4) // Give them explosives + Grenades for the Grenade spec. Might be too many grenades, but we'll find out.
+		if(4) //Amr sniper ammo.
+			spawnitems = list(/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel,
+							/obj/item/ammo_magazine/sniper/anti_materiel)
+		if(5) // Give them explosives + Grenades for the Grenade spec. Might be too many grenades, but we'll find out.
 			spawnitems = list(/obj/item/storage/box/explosive_mines,
 							/obj/item/storage/belt/grenade/full)
-		if(5) // Pyrotech
+		if(6) // Pyrotech
 			var/fuel = pick(/obj/item/ammo_magazine/flamer_tank/large/B, /obj/item/ammo_magazine/flamer_tank/large/X)
 			spawnitems = list(/obj/item/ammo_magazine/flamer_tank/large,
 							/obj/item/ammo_magazine/flamer_tank/large,
 							fuel)
-		if(6) // Scout
+		if(7) // Scout
 			spawnitems = list(/obj/item/ammo_magazine/rifle/m4ra/custom,
 							/obj/item/ammo_magazine/rifle/m4ra/custom,
 							/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,

code/game/machinery/camera/presets.dm

@@ -79,6 +79,9 @@
 /obj/structure/machinery/camera/autoname/almayer/dropship_two
 	network = list(CAMERA_NET_ALMAYER, CAMERA_NET_NORMANDY)
 
+/obj/structure/machinery/camera/autoname/almayer/dropship_three
+	network = list(CAMERA_NET_ALMAYER, CAMERA_NET_RESEARCH)
+
 /obj/structure/machinery/camera/autoname/almayer
 	name = "military-grade camera"
 	network = list(CAMERA_NET_ALMAYER)