Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Florina Moment #5427

Merged
merged 1 commit into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions maps/fiorina_sciannex.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
8 changes: 4 additions & 4 deletions maps/prison_station_fop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
Loading