[DNM] [TM] ONLY - Odolla Onslaught

code/__DEFINES/job.dm

@@ -3,8 +3,8 @@
 #define GET_DEFAULT_ROLE(title) (RoleAuthority?.default_roles[title] ? RoleAuthority.default_roles[title] : title)
 
 // Squad name defines
-#define SQUAD_MARINE_1 "Sun Riders"
-#define SQUAD_MARINE_2 "Bravo"
+#define SQUAD_MARINE_1 "Iron Heads"
+#define SQUAD_MARINE_2 "Storm Breakers"
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
@@ -14,6 +14,7 @@
 #define SQUAD_CBRN "CBRN"
 #define SQUAD_UPP "Red Dawn"
 #define SQUAD_LRRP "Snake Eaters"
+#define SQUAD_VAIPO "Venelli-Aegis Inc."
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
@@ -40,6 +41,13 @@
 #define JOB_SQUAD_MARINE_FORECON "FORECON Rifleman"
 #define JOB_SQUAD_SMARTGUN_FORECON "FORECON Smartgunner"
 
+#define JOB_SQUAD_LEADER_VAIPO "VAIPO Team Leader"
+#define JOB_SQUAD_MARKSMAN_VAIPO  "VAIPO Marksman"
+#define JOB_SQUAD_MEDIC_VAIPO "VAIPO Medic"
+#define JOB_SQUAD_MARINE_VAIPO "VAIPO Contractor"
+#define JOB_SQUAD_SMARTGUN_VAIPO "VAIPO Automatic Rifleman"
+
+
 var/global/list/job_squad_roles = JOB_SQUAD_ROLES_LIST
 
 #define JOB_COLONIST "Colonist"

code/__DEFINES/mode.dm

@@ -123,7 +123,7 @@ var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH,
 var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
 var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
 var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO)
-var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP)
+var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP, SQUAD_VAIPO)
 
 //Groundside roles
 var/global/list/ROLES_XENO = list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)
@@ -138,9 +138,10 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR
 
 
 var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
-var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
+var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE, JOB_SYNTH, JOB_CORPORATE_LIAISON)
 var/global/list/ROLES_AI_UPP = list(JOB_SO_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SQUAD_MARINE_UPP)
 var/global/list/ROLES_AI_FORECON = list(JOB_SQUAD_LEADER_FORECON, JOB_SQUAD_MEDIC_FORECON, JOB_SQUAD_TEAM_LEADER_FORECON, JOB_SQUAD_SMARTGUN_FORECON, JOB_SQUAD_MARINE_FORECON, JOB_SQUAD_RTO)
+var/global/list/ROLES_AI_VAIPO = list(JOB_SQUAD_LEADER_VAIPO, JOB_SQUAD_MEDIC_VAIPO, JOB_SQUAD_SMARTGUN_VAIPO, JOB_SQUAD_MARINE_VAIPO, JOB_SQUAD_MARKSMAN_VAIPO)
 var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
 #define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\

code/datums/medal_awards.dm

@@ -2,6 +2,7 @@
 #define MARINE_BRONZE_HEART_MEDAL "bronze heart medal"
 #define MARINE_VALOR_MEDAL "medal of valor"
 #define MARINE_HEROISM_MEDAL "medal of exceptional heroism"
+#define MARINE_ODOLLA_CAMPAIGN_MEDAL "Odolla's Cradle campaign medal"
 
 #define ALL_MARINE_MEDALS list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL)
 
@@ -148,6 +149,8 @@ GLOBAL_LIST_EMPTY(jelly_awards)
 				medal = new /obj/item/clothing/accessory/medal/silver/valor(medal_location)
 			if(MARINE_HEROISM_MEDAL)
 				medal = new /obj/item/clothing/accessory/medal/gold/heroism(medal_location)
+			if(MARINE_ODOLLA_CAMPAIGN_MEDAL)
+				medal = new /obj/item/clothing/accessory/medal/gold/odolla(medal_location)
 			else
 				return FALSE
 		medal.recipient_name = chosen_recipient

code/datums/paygrades/factions/other/contractors.dm

@@ -14,9 +14,9 @@
 	pay_multiplier = 1.75
 
 /datum/paygrade/contractors/mg
-	paygrade = "VAI-G"
-	name = "VAI Machinegunner"
-	prefix = "VAI MG"
+	paygrade = "VAI-AR"
+	name = "VAI Automatic Rifleman"
+	prefix = "VAI AR"
 	pay_multiplier = 1.75
 
 /datum/paygrade/contractors/engi

code/datums/skills/uscm.dm

@@ -59,12 +59,10 @@ United States Colonial Marines
 	name = "Squad Weapons Specialist"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set.
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
-		SKILL_JTAC = SKILL_JTAC_BEGINNER
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
 	)
 
 /datum/skills/tl

code/datums/vehicles.dm

@@ -30,6 +30,11 @@
 	name = "Movie APC"
 	interior_id = "apc_movie"
 
+/datum/map_template/interior/apc_custom
+	name = "Pit Stop APC"
+	interior_id = "apc_custom"
+
+
 /datum/map_template/interior/arc
 	name = "ARC"
 	interior_id = "arc"
@@ -42,6 +47,10 @@
 	name = "Tank"
 	interior_id = "tank"
 
+/datum/map_template/interior/tank_custom
+	name = "Six Feet Thunder Tank"
+	interior_id = "tank_custom"
+
 /datum/map_template/interior/aev
 	name = "AEV"
 	interior_id = "aev"

code/datums/weather/weather_events/big_red.dm

@@ -42,3 +42,27 @@
 	ambience = 'sound/ambience/strata/strata_blizzard.ogg'
 
 	fire_smothering_strength = 3
+
+/datum/weather_event/pollen
+	name = "Pollenstorm"
+	display_name = "Pollenstorm"
+	length = 5 MINUTES
+	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
+	turf_overlay_icon_state = "hallucination"
+
+	effect_message = "You feel colourful sickly-sweet pollen cover you..."
+	damage_per_tick = 0.001
+	damage_type = TOX
+	ambience = 'sound/ambience/rainforest.ogg'
+	fire_smothering_strength = 0
+
+/datum/weather_event/pollen/process_mob_effect(mob/living/carbon/affected_mob, delta_time = 1)
+	..()
+	if(!ishuman(affected_mob))
+		return
+	var/mob/living/carbon/human/human = affected_mob
+	if(human.wear_mask && (human.wear_mask.flags_inventory & BLOCKGASEFFECT))
+		return
+	if(human.head && (human.head.flags_inventory & BLOCKGASEFFECT))
+		return
+	human.hallucination += 5

code/datums/weather/weather_map_holders/big_red.dm

@@ -14,3 +14,19 @@
 
 /datum/weather_ss_map_holder/big_red/should_start_event()
 	return prob(PROB_WEATHER_BIG_RED)
+
+/datum/weather_ss_map_holder/pollen
+	name = "hallucinations Holder"
+
+	min_time_between_events = 5 MINUTES
+	no_weather_turf_icon_state = "strata_clearsky"
+
+	potential_weather_events = list(
+		/datum/weather_event/pollen,
+	)
+
+/datum/weather_ss_map_holder/pollen/should_affect_area(area/A)
+	return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)
+
+/datum/weather_ss_map_holder/pollen/should_start_event()
+	return prob(100)

code/game/area/IceColony.dm

@@ -31,7 +31,7 @@
 	power_light = FALSE
 	power_equip = FALSE
 	power_environ = FALSE
-	temperature = ICE_COLONY_TEMPERATURE
+	temperature = 375
 
 /*
  * Exterior - Surface

code/game/area/Sulaco.dm

@@ -149,6 +149,33 @@
 		return FALSE
 	return TRUE
 
+/area/shuttle/skully
+	name = "\improper Dropship Skully"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/skully/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+
+/area/shuttle/wrecker
+	name = "\improper Dropship Wrecker"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/wrecker/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
 
 //DISTRESS SHUTTLES