Commitmore

cmss13-devs · Jun 21, 2024 · 340f404 · 340f404
1 parent 79f4ffb
commit 340f404
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 13 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -39,7 +39,6 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 #define MEDICAL_SURVIVOR "Medical Survivor"
 #define ENGINEERING_SURVIVOR "Engineering Survivor"
 #define CORPORATE_SURVIVOR "Corporate Survivor"
-#define HOSTILE_SURVIVOR "Hostile Survivor" //AKA Marine Killers assuming they survive. Will do cultist survivor at some point.
 #define SURVIVOR_VARIANT_LIST list(ANY_SURVIVOR = "Any", CIVILIAN_SURVIVOR = "Civ", SECURITY_SURVIVOR = "Sec", SCIENTIST_SURVIVOR = "Sci", MEDICAL_SURVIVOR = "Med", ENGINEERING_SURVIVOR = "Eng", CORPORATE_SURVIVOR = "W-Y")
 
 //-1 is infinite amount, these are soft caps and can be bypassed by randomization

diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm
@@ -8,7 +8,6 @@
 	faction = FACTION_CLF
 	faction_group = list(FACTION_CLF, FACTION_SURVIVOR)
 	access = list(ACCESS_CIVILIAN_PUBLIC)
-	survivor_variant = HOSTILE_SURVIVOR
 
 /datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/new_human)
 

diff --git a/maps/bigredv2.json b/maps/bigredv2.json
@@ -15,7 +15,6 @@
         "/datum/equipment_preset/survivor/colonial_marshal/solaris",
         "/datum/equipment_preset/survivor/corporate/solaris",
         "/datum/equipment_preset/survivor/flight_control_operator",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/corsat.json b/maps/corsat.json
@@ -15,7 +15,6 @@
         "/datum/equipment_preset/survivor/security/corsat",
         "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/corsat",
         "/datum/equipment_preset/survivor/engineer/corsat",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/desert_dam.json b/maps/desert_dam.json
@@ -15,7 +15,6 @@
         "/datum/equipment_preset/survivor/trucker/trijent",
         "/datum/equipment_preset/survivor/security/trijent",
         "/datum/equipment_preset/survivor/corporate/trijent",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json
@@ -13,7 +13,6 @@
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/gangleader",
         "/datum/equipment_preset/survivor/engineer/fiorina",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json
@@ -11,7 +11,6 @@
         "/datum/equipment_preset/survivor/scientist/shiva",
         "/datum/equipment_preset/survivor/engineer/shiva",
         "/datum/equipment_preset/survivor/security/shiva",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/kutjevo.json b/maps/kutjevo.json
@@ -11,7 +11,6 @@
         "/datum/equipment_preset/survivor/colonial_marshal/kutjevo",
         "/datum/equipment_preset/survivor/trucker/kutjevo",
         "/datum/equipment_preset/survivor/security/kutjevo",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/lv624.json b/maps/lv624.json
@@ -14,7 +14,6 @@
         "/datum/equipment_preset/survivor/security/lv",
         "/datum/equipment_preset/survivor/colonial_marshal/lv",
         "/datum/equipment_preset/survivor/goon",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "map_item_type": "/obj/item/map/lazarus_landing_map",

diff --git a/maps/new_varadero.json b/maps/new_varadero.json
@@ -14,8 +14,7 @@
         "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison/nv",
         "/datum/equipment_preset/survivor/security/nv",
         "/datum/equipment_preset/survivor/beachbum",
-        "/datum/equipment_preset/survivor/miner",
-        "/datum/equipment_preset/survivor/clf"
+        "/datum/equipment_preset/survivor/miner"
     ],
 	"CO_survivor_types": [
         "/datum/equipment_preset/survivor/new_varadero/commander"

diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json
@@ -11,7 +11,6 @@
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/gangleader",
         "/datum/equipment_preset/survivor/engineer/fiorina",
-        "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [

diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json
@@ -13,7 +13,6 @@
         "/datum/equipment_preset/survivor/engineer/shiva",
         "/datum/equipment_preset/survivor/colonial_marshal/shiva",
         "/datum/equipment_preset/survivor/security/shiva",
-        "/datum/equipment_preset/survivor/clf/cold",
         "/datum/equipment_preset/survivor/civilian"
     ],
     "defcon_triggers": [