cmss13-devs · Zenith00000 · Apr 30, 2024 · May 1, 2024 · May 2, 2024 · May 2, 2024
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -42,6 +42,7 @@
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_TYRARGO_RIFT "Tyrargo Rift"
 #define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
+#define MAP_FIRE_COLONY "LV-376 Charon's Crucible"//heavily modified ice colony V2 - low-medium pop
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_ROSTOCK "SSV Rostock" //UPP Warship
 #define MAP_HUNTERSHIP "Hunter Ship"
@@ -409,6 +410,8 @@
 #define WALL_SHIVA_FAB_PINK "shiva_fab_pnk"
 #define WALL_SHIVA_FAB_WHITE "shiva_fab_wht"
 #define WALL_SHIVA_FAB_RED "shiva_fab_red"
+#define WALL_SHIVA_FAB_DARK "shiva_fab_dark"
+#define WALL_ENGINEER_RUIN "engineer_stone"
 #define WALL_DOME "dome"
 #define WALL_DOMER "r_dome"
 #define WALL_SOLARIS "solaris_interior"

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -318,6 +318,34 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_HC_DEPUTY_DIRECTOR "HC Deputy Director"
 #define JOB_HC_DIRECTOR "HC Director"
 
+//-------- Lasalle Bionational --------//
+
+#define JOB_LB_SEC "L-B Corporate Security"
+#define JOB_LB_SEC_SYNTH "L-B Corporate Security Synthetic"
+#define JOB_LB_TRAINEE "Corporate Trainee"
+#define JOB_LB_JUNIOR_EXECUTIVE "Corporate Junior Executive"
+#define JOB_LB_CORPORATE_LIAISON "Corporate Liaison"
+#define JOB_LB_EXECUTIVE "Corporate Executive"
+#define JOB_LB_SENIOR_EXECUTIVE "Corporate Senior Executive"
+#define JOB_LB_EXECUTIVE_SPECIALIST "Corporate Executive Specialist"
+#define JOB_LB_LEGAL_SPECIALIST "Corporate Legal Specialist"
+#define JOB_LB_EXECUTIVE_SUPERVISOR "Corporate Executive Supervisor"
+#define JOB_LB_LEGAL_SUPERVISOR "Corporate Legal Supervisor"
+#define JOB_LB_ASSISTANT_MANAGER "Corporate Assistant Manager"
+#define JOB_LB_DIVISION_MANAGER "Corporate Division Manager"
+#define JOB_LB_CHIEF_EXECUTIVE "Corporate Chief Executive"
+#define JOB_LB_DEPUTY_DIRECTOR "L-B Deputy Director"
+#define JOB_LB_DIRECTOR "L-B Director"
+
+#define JOB_LB_MERC "HIG (Operator)"
+#define JOB_LB_MERC_MEDIC "HIG (Medical Specialist)"
+#define JOB_LB_MERC_ENGI "HIG (Technical Specialist)"
+#define JOB_LB_MERC_SP "HIG (Senior Operator)"
+#define JOB_LB_MERC_TL "HIG (Team Leader)"
+#define JOB_LB_MERC_COMMANDER "HIG (Operations Commander)"
+#define JOB_LB_MERC_SG "HIG (Smartgunner)"
+#define JOB_LB_MERC_SYN "HIG (Support Synthetic)"
+
 //---- Contractors ----//
 #define JOB_CONTRACTOR "VAIPO Mercenary"
 #define JOB_CONTRACTOR_ST "VAIPO Mercenary"

diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -73,6 +73,7 @@
 #define MOB_HUD_XENO_HIVE_RENEGADE 39
 #define MOB_HUD_XENO_HIVE_TUTORIAL 40
 #define MOB_HUD_XENO_HIVE_K_SERIES 41
+#define MOB_HUD_FACTION_LB 42
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -260,6 +260,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_IASF "Imperial Armed Space Force"
 #define FACTION_PAP "People's Armed Police"
 #define FACTION_HYPERDYNE "Hyperdyne Corporation"
+#define FACTION_LASALLE_BIONATIONAL "Lasalle Bionational"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
 #define FACTION_MERCENARY "Mercenary"
 #define FACTION_FREELANCER "Freelancer"
@@ -293,6 +294,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_MILITARY_CASTE, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE, FACTION_HUNTED, FACTION_HUNTED_CLF, FACTION_HUNTED_UPP, FACTION_HUNTED_TWE, FACTION_HUNTED_MERC, FACTION_HUNTED_PMC, FACTION_HUNTED_MISC)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_HYPERDYNE list(FACTION_HYPERDYNE)
+#define FACTION_LIST_LASALLE_BIONATIONAL list(FACTION_LASALLE_BIONATIONAL)
 #define FACTION_LIST_UPP list(FACTION_UPP)
 #define FACTION_LIST_CLF list(FACTION_CLF)
 #define FACTION_LIST_TWE list(FACTION_TWE, FACTION_IASF)
@@ -307,6 +309,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_SURVIVOR_PAP list(FACTION_SURVIVOR, FACTION_PAP, FACTION_UPP)
 #define FACTION_LIST_SURVIVOR_UPP list(FACTION_SURVIVOR, FACTION_UPP)
 #define FACTION_LIST_SURVIVOR_HYPERDYNE list(FACTION_SURVIVOR, FACTION_UPP, FACTION_HYPERDYNE)
+#define FACTION_LIST_SURVIVOR_LASALLE_BIONATIONAL list(FACTION_SURVIVOR, FACTION_LASALLE_BIONATIONAL)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY)
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)

diff --git a/code/__DEFINES/origins.dm b/code/__DEFINES/origins.dm
@@ -30,3 +30,9 @@
 
 // CMB
 #define ORIGIN_CMB "The Colonial Marshal Bureau"
+
+// LASALLE BIONATIONAL
+
+#define ORIGIN_LB "Lasalle Bionational Corporation"
+#define ORIGIN_LB_SEC "Lasalle Bionational Security Forces"
+#define ORIGIN_LB_MERC "Lasalle Bionational Hazard Intervention Group"
diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm
@@ -68,6 +68,10 @@
 
 #define RADIO_CHANNEL_HYPERDYNE "Hyperdyne"
 
+//Lasalle Bionational Comms
+
+#define RADIO_CHANNEL_LASALLE_BIONATIONAL "Lasalle Bionational"
+
 //Listening Devices
 #define RADIO_CHANNEL_BUG_A "Listening Device A"
 #define RADIO_CHANNEL_BUG_B "Listening Device B"

diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
@@ -94,6 +94,8 @@
 #define AMBIENCE_MALL 'sound/ambience/medbay1.ogg'
 #define AMBIENCE_CAVE 'sound/ambience/desert.ogg'
 #define AMBIENCE_YAUTJA 'sound/ambience/yautja_ship.ogg'
+#define AMBIENCE_VOLCANIC 'sound/ambience/lava/fire_colony_ambience.ogg'
+#define AMBIENCE_ANCIENT_TEMPLE 'sound/ambience/lava/engineer_temple.ogg'
 
 #define SOUND_MARINE_DRUMS 'sound/effects/drums.ogg'
 
@@ -107,7 +109,7 @@
 #define SCAPE_PL_WIND list('sound/soundscape/wind1.ogg','sound/soundscape/wind2.ogg')
 #define SCAPE_PL_LV522_OUTDOORS list('sound/soundscape/lv522/outdoors/wind1.ogg','sound/soundscape/lv522/outdoors/wind2.ogg','sound/soundscape/lv522/outdoors/wind3.ogg',)
 #define SCAPE_PL_LV522_INDOORS list('sound/soundscape/lv522/indoors/indoor_wind.ogg','sound/soundscape/lv522/indoors/indoor_wind2.ogg')
-#define SCAPE_PL_CAVE list('sound/soundscape/rocksfalling1.ogg', 'sound/soundscape/rocksfalling2.ogg')
+#define SCAPE_PL_CAVE list('sound/soundscape/rocksfalling1.ogg', 'sound/soundscape/rocksfalling2.ogg', 'sound/soundscape/rocksfalling3.ogg', 'sound/soundscape/rocksfalling4.ogg', 'sound/soundscape/cave_impact.ogg', 'sound/soundscape/cave_groan.ogg',)
 #define SCAPE_PL_ELEVATOR_MUSIC list('sound/soundscape/medbay1.ogg','sound/soundscape/medbay2.ogg', 'sound/soundscape/medbay3.ogg')
 #define SCAPE_PL_THUNDER list('sound/soundscape/thunderclap1.ogg', 'sound/soundscape/thunderclap2.ogg')
 #define SCAPE_PL_DESERT_STORM list('sound/soundscape/thunderclap1.ogg', 'sound/soundscape/thunderclap2.ogg', 'sound/soundscape/wind1.ogg','sound/soundscape/wind2.ogg')

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -123,6 +123,10 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 
 #define HDC_FREQ 1331
 
+//Lasalle Bionational channels (1401-1460)
+
+#define LB_FREQ 1401
+
 //General Radio
 #define MIN_FREQ 1460 // ------------------------------------------------------
 #define PUB_FREQ 1461
@@ -209,6 +213,8 @@ GLOBAL_LIST_INIT(radiochannels, list(
 
 	RADIO_CHANNEL_HYPERDYNE = HDC_FREQ,
 
+	RADIO_CHANNEL_LASALLE_BIONATIONAL = LB_FREQ,
+
 	RADIO_CHANNEL_WY = WY_FREQ,
 	RADIO_CHANNEL_WY_PUB = WY_PUB_FREQ,
 	RADIO_CHANNEL_WY_SEC = WY_SEC_FREQ,
@@ -356,6 +362,7 @@ SUBSYSTEM_DEF(radio)
 		"[FAX_USCM_HC_FREQ]" = "aiprivradio",
 		"[FAX_USCM_PVST_FREQ]" = "aiprivradio",
 		"[HDC_FREQ]" = "hdcradio",
+		"[LB_FREQ]" = "lbradio",
 	)
 
 /datum/controller/subsystem/radio/fire(resumed)

diff --git a/code/datums/ammo/bullet/rifle.dm b/code/datums/ammo/bullet/rifle.dm
@@ -328,3 +328,16 @@
 
 	damage = 30
 	penetration = ARMOR_PENETRATION_TIER_8
+
+/datum/ammo/bullet/rifle/w_ek_17
+	name = "7.6mm rifle bullet"
+
+	damage = 35
+	penetration = ARMOR_PENETRATION_TIER_1
+	accurate_range = 14
+	effective_range_max = 6
+	max_range = 22
+	accuracy = HIT_ACCURACY_TIER_3
+	scatter = SCATTER_AMOUNT_TIER_10
+	shell_speed = AMMO_SPEED_TIER_6
+	damage_falloff = DAMAGE_FALLOFF_TIER_5
diff --git a/code/datums/ammo/bullet/smg.dm b/code/datums/ammo/bullet/smg.dm
@@ -165,3 +165,25 @@
 	penetration = ARMOR_PENETRATION_TIER_4
 	damage_falloff = DAMAGE_FALLOFF_TIER_6
 	scatter = SCATTER_AMOUNT_TIER_6
+
+/datum/ammo/bullet/smg/a_m36
+	name = "armor-piercing laserbolt"
+	icon_state = "redtrac"
+	damage = 30
+	accurate_range = 5
+	effective_range_max = 6
+	penetration = ARMOR_PENETRATION_TIER_2
+	shell_speed = AMMO_SPEED_TIER_4
+	scatter = SCATTER_AMOUNT_TIER_3
+	accuracy = HIT_ACCURACY_TIER_2
+	damage_type = BURN
+	shrapnel_chance = 0
+	flags_ammo_behavior = AMMO_LASER
+	hit_effect_color = "#ff0000"
+	///chance of the bullet burning the mob
+	var/ignition_probability = 5
+
+/datum/ammo/bullet/smg/a_m36/on_hit_mob(mob/target, obj/projectile/bullet)
+	..()
+	if(prob(ignition_probability))
+		target.fire_act()
diff --git a/code/datums/components/damage_over_time.dm b/code/datums/components/damage_over_time.dm
@@ -15,20 +15,28 @@
 	var/cause_path
 	/// Whether the damage is considered to be from an environmental source
 	var/enviro = FALSE
+	/// Whether the DOT applies fire stacks or not
+	var/apply_fire = FALSE
+	/// stuff for fire stacks
+	var/burn_reagent = /datum/reagent/napalm/ut
+	var/burn_stacks = 30
 
 	/// Parent as a living mob
 	var/mob/living/living_parent
 
-/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro)
+/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro, apply_fire, burn_reagent, burn_stacks)
 	return // Ultimately just here to suppress named arg errors
 
-/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE)
+/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE, apply_fire=FALSE, burn_reagent = /datum/reagent/napalm/ut, burn_stacks = 30)
 	src.dam_amount = dam_amount
 	src.dam_type = dam_type
 	src.target_temp = target_temp
 	src.temp_delta = temp_delta
 	src.cause_path = cause_path
 	src.enviro = enviro
+	src.apply_fire = apply_fire
+	src.burn_reagent = burn_reagent
+	src.burn_stacks = burn_stacks
 
 	living_parent = parent
 
@@ -78,6 +86,12 @@
 			living_parent.bodytemperature -= temp_delta
 		else
 			living_parent.bodytemperature = target_temp
+	if(apply_fire)
+		if(ispath(burn_reagent))
+			var/datum/reagent/temp = burn_reagent
+			burn_reagent = GLOB.chemical_reagents_list[initial(temp.id)]
+		living_parent.TryIgniteMob(burn_stacks, burn_reagent) //30 burn stacks, proc needs a reagent to work.
+
 
 /datum/component/damage_over_time/RegisterWithParent()
 	START_PROCESSING(SSdcs, src)

diff --git a/code/datums/factions/clf.dm b/code/datums/factions/clf.dm
@@ -62,15 +62,15 @@
 
 		list("SIDEARMS", 0, null, null, null),
 		list("88 Mod 4 Combat Pistol", 15, /obj/item/weapon/gun/pistol/mod88, null, VENDOR_ITEM_REGULAR),
-		list("Beretta 92FS Pistol", 15, /obj/item/weapon/gun/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
+		list("Beretta M92X Pistol", 15, /obj/item/weapon/gun/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
 		list("CMB Spearhead Autorevolver", 15, /obj/item/weapon/gun/revolver/cmb, null, VENDOR_ITEM_REGULAR),
 		list("Holdout Pistol", 10, /obj/item/weapon/gun/pistol/holdout, null, VENDOR_ITEM_REGULAR),
 		list("KT-42 Automag", 15, /obj/item/weapon/gun/pistol/kt42, null, VENDOR_ITEM_REGULAR),
 		list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARM AMMUNITION", 0, null, null, null),
 		list("88M4 AP Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/mod88, null, VENDOR_ITEM_REGULAR),
-		list("Beretta 92FS Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
+		list("Beretta M92X Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
 		list("KT-42 Magazine (.44)", 5, /obj/item/ammo_magazine/pistol/kt42, null, VENDOR_ITEM_REGULAR),
 		list("Spearhead Speed Loader (.357)", 10, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR),
 		list("Hollowpoint Spearhead Speed Loader (.357)", 5, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR),
@@ -130,15 +130,15 @@
 
 		list("SIDEARMS", -1, null, null),
 		list("88 Mod 4 Combat Pistol", 20, /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR),
-		list("Beretta 92FS Pistol", 20, /obj/item/weapon/gun/pistol/b92fs, VENDOR_ITEM_REGULAR),
+		list("Beretta M92X Pistol", 20, /obj/item/weapon/gun/pistol/b92fs, VENDOR_ITEM_REGULAR),
 		list("CMB Spearhead Autorevolver", 20, /obj/item/weapon/gun/revolver/cmb, VENDOR_ITEM_REGULAR),
 		list("Holdout Pistol", 20, /obj/item/weapon/gun/pistol/holdout, VENDOR_ITEM_REGULAR),
 		list("KT-42 Automag", 20, /obj/item/weapon/gun/pistol/kt42, VENDOR_ITEM_REGULAR),
 		list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARM AMMUNITION", -1, null, null),
 		list("88M4 AP Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR),
-		list("Beretta 92FS Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/b92fs, VENDOR_ITEM_REGULAR),
+		list("Beretta M92X Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/b92fs, VENDOR_ITEM_REGULAR),
 		list("KT-42 Magazine (.44)", 40, /obj/item/ammo_magazine/pistol/kt42, VENDOR_ITEM_REGULAR),
 		list("Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR),
 		list("Hollowpoint Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR),

diff --git a/code/datums/factions/lasalle_bionational.dm b/code/datums/factions/lasalle_bionational.dm
@@ -0,0 +1,60 @@
+/datum/faction/lasalle_bionational
+	name = "Lasalle Bionational"
+	faction_tag = FACTION_LASALLE_BIONATIONAL
+	base_icon_file = 'icons/mob/hud/factions/lasalle_bionational.dmi'
+
+/datum/faction/lasalle_bionational/modify_hud_holder(image/holder, mob/living/carbon/human/human)
+	var/icon/override_icon_file
+	var/hud_icon_state
+	var/_role = human.job
+	if(!_role)
+		var/obj/item/card/id/id_card = human.get_idcard()
+		if(id_card)
+			_role = id_card.rank
+	switch(_role)
+		if(JOB_LB_MERC)
+			hud_icon_state = "merc"
+		if(JOB_LB_MERC_MEDIC)
+			hud_icon_state = "medic"
+		if(JOB_LB_MERC_ENGI)
+			hud_icon_state = "engi"
+		if(JOB_LB_MERC_SP)
+			hud_icon_state = "spec"
+		if(JOB_LB_MERC_TL)
+			hud_icon_state = "leader"
+		if(JOB_LB_MERC_SYN)
+			hud_icon_state = "synth"
+		if(JOB_LB_MERC_SG)
+			hud_icon_state = "sg"
+		if(JOB_LB_MERC_COMMANDER)
+			hud_icon_state = "com"
+		if(JOB_LB_SEC)
+			hud_icon_state = "security"
+		if(JOB_LB_SEC_SYNTH)
+			hud_icon_state = "synth"
+		if(JOB_LB_TRAINEE)
+			hud_icon_state = "trainee"
+		if(JOB_LB_JUNIOR_EXECUTIVE)
+			hud_icon_state = "junior_exec"
+		if(JOB_LB_CORPORATE_LIAISON)
+			hud_icon_state = "liaison"
+		if(JOB_LB_EXECUTIVE)
+			hud_icon_state = "exec"
+		if(JOB_LB_SENIOR_EXECUTIVE)
+			hud_icon_state = "senior_exec"
+		if(JOB_LB_EXECUTIVE_SPECIALIST, JOB_LB_LEGAL_SPECIALIST)
+			hud_icon_state = "exec_spec"
+		if(JOB_LB_EXECUTIVE_SUPERVISOR, JOB_LB_LEGAL_SUPERVISOR)
+			hud_icon_state = "exec_super"
+		if(JOB_LB_ASSISTANT_MANAGER)
+			hud_icon_state = "ass_man"
+		if(JOB_LB_DIVISION_MANAGER)
+			hud_icon_state = "div_man"
+		if(JOB_LB_CHIEF_EXECUTIVE)
+			hud_icon_state = "chief_man"
+		if(JOB_LB_DEPUTY_DIRECTOR)
+			hud_icon_state = "dep_director"
+		if(JOB_LB_DIRECTOR)
+			hud_icon_state = "director"
+	if(hud_icon_state)
+		holder.overlays += image(override_icon_file ? override_icon_file : base_icon_file, human, "ls_[hud_icon_state]")
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
@@ -355,6 +355,8 @@
 					monkey_types += /mob/living/carbon/human/monkey
 				if("neaera")
 					monkey_types += /mob/living/carbon/human/neaera
+				if("neaera_alt")
+					monkey_types += /mob/living/carbon/human/neaera_alt
 				if("stok")
 					monkey_types += /mob/living/carbon/human/stok
 				if("yiren")

diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
@@ -31,6 +31,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 	MOB_HUD_FACTION_UPP = new /datum/mob_hud/faction/upp(),
 	MOB_HUD_FACTION_WY = new /datum/mob_hud/faction/wy(),
 	MOB_HUD_FACTION_HC = new /datum/mob_hud/faction/hyperdyne(),
+	MOB_HUD_FACTION_LB = new /datum/mob_hud/faction/lasalle_bionational(),
 	MOB_HUD_FACTION_TWE = new /datum/mob_hud/faction/twe(),
 	MOB_HUD_FACTION_IASF = new /datum/mob_hud/faction/iasf(),
 	MOB_HUD_FACTION_CLF = new /datum/mob_hud/faction/clf(),
@@ -246,6 +247,9 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist(
 /datum/mob_hud/faction/hyperdyne
 	faction_to_check = FACTION_HYPERDYNE
 
+/datum/mob_hud/faction/lasalle_bionational
+	faction_to_check = FACTION_LASALLE_BIONATIONAL
+
 /datum/mob_hud/faction/twe
 	faction_to_check = FACTION_TWE
 

diff --git a/code/datums/origin/lasalle_bionational.dm b/code/datums/origin/lasalle_bionational.dm
@@ -0,0 +1,11 @@
+/datum/origin/lb
+	name = ORIGIN_LB
+	desc = "You were born on a Lasalle Bionational colony and have decided to work your way towards the corporate ladder."
+
+/datum/origin/lb/sec
+	name = ORIGIN_LB_SEC
+	desc = "You were born on a Lasalle Bionational colony. You didn't have many choices so you joined their lowly security force."
+
+/datum/origin/lb/merc
+	name = ORIGIN_LB_MERC
+	desc = "You were born on a Lasalle Bionational colony and joined the USCM, you were one of the best and were honorably discharged. Lasalle Bionational noticed your achievements and offered you a contract to join their elite security forces. You happily accepted."