Funniest Shit

cmss13-devs · Jan 11, 2024 · a9524c4 · a9524c4
1 parent 9b2d08a
commit a9524c4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm
@@ -1,9 +1,9 @@
 
-/datum/equipment_preset/survivor/scientist/florina
-	name = "Survivor - Florina Researcher"
-	assignment = "Florina Researcher"
+/datum/equipment_preset/survivor/scientist/fiorina
+	name = "Survivor - Fiorina Researcher"
+	assignment = "Fiorina Researcher"
 
-/datum/equipment_preset/survivor/scientist/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/scientist/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(new_human), WEAR_JACKET)
@@ -15,20 +15,20 @@
 	..()
 
 
-/datum/equipment_preset/survivor/doctor/florina
-	name = "Survivor - Florina Doctor"
-	assignment = "Florina Doctor"
+/datum/equipment_preset/survivor/doctor/fiorina
+	name = "Survivor - Fiorina Doctor"
+	assignment = "Fiorina Doctor"
 
-/datum/equipment_preset/survivor/doctor/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/doctor/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
 	..()
 
-/datum/equipment_preset/survivor/security/florina
-	name = "Survivor - Florina Prison Guard"
-	assignment = "Florina Prison Guard"
+/datum/equipment_preset/survivor/security/fiorina
+	name = "Survivor - Fiorina Prison Guard"
+	assignment = "Fiorina Prison Guard"
 
-/datum/equipment_preset/survivor/security/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/security/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
@@ -37,11 +37,11 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
 	..()
 
-/datum/equipment_preset/survivor/colonial_marshal/florina
+/datum/equipment_preset/survivor/colonial_marshal/fiorina
 	name = "Survivor - United Americas Riot Officer"
 	assignment = "United Americas Riot Officer"
 
-/datum/equipment_preset/survivor/colonial_marshal/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET)
@@ -52,11 +52,11 @@
 
 	..()
 
-/datum/equipment_preset/survivor/engineer/florina
-	name = "Survivor - Florina Engineer"
-	assignment = "Florina Engineer"
+/datum/equipment_preset/survivor/engineer/fiorina
+	name = "Survivor - Fiorina Engineer"
+	assignment = "Fiorina Engineer"
 
-/datum/equipment_preset/survivor/engineer/florina/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/engineer/fiorina/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)

diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json
@@ -4,15 +4,15 @@
     "map_file": "Fiorina_SciAnnex.dmm",
     "webmap_url": "Fiorina",
     "survivor_types": [
-        "/datum/equipment_preset/survivor/scientist/florina",
-        "/datum/equipment_preset/survivor/doctor/florina",
+        "/datum/equipment_preset/survivor/scientist/fiorina",
+        "/datum/equipment_preset/survivor/doctor/fiorina",
         "/datum/equipment_preset/survivor/interstellar_human_rights_observer",
-        "/datum/equipment_preset/survivor/security/florina",
-        "/datum/equipment_preset/survivor/colonial_marshal/florina",
+        "/datum/equipment_preset/survivor/security/fiorina",
+        "/datum/equipment_preset/survivor/colonial_marshal/fiorina",
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/gangleader",
-        "/datum/equipment_preset/survivor/engineer/florina",
+        "/datum/equipment_preset/survivor/engineer/fiorina",
         "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],

diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json
@@ -3,14 +3,14 @@
     "map_path": "map_files/FOP_v2_Cellblocks",
     "map_file": "Prison_Station_FOP.dmm",
     "survivor_types": [
-        "/datum/equipment_preset/survivor/scientist/florina",
-        "/datum/equipment_preset/survivor/doctor/florina",
+        "/datum/equipment_preset/survivor/scientist/fiorina",
+        "/datum/equipment_preset/survivor/doctor/fiorina",
         "/datum/equipment_preset/survivor/interstellar_human_rights_observer",
-        "/datum/equipment_preset/survivor/security/florina",
+        "/datum/equipment_preset/survivor/security/fiorina",
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/prisoner",
         "/datum/equipment_preset/survivor/gangleader",
-        "/datum/equipment_preset/survivor/engineer/florina",
+        "/datum/equipment_preset/survivor/engineer/fiorina",
         "/datum/equipment_preset/survivor/clf",
         "/datum/equipment_preset/survivor/civilian"
     ],