cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] move fbp to defines (#11332)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-06 20:39:48 -07:00
committed by GitHub
parent 43253a58b8
commit 345661ed8a
12 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/__defines/mobs.dm
View File

@@ -332,6 +332,11 @@
#define SPECIES_HANNER "Hanner"
#define SPECIES_SPARKLE "Sparkle Dog"
// FBG types
#define FBP_ASSISTED "assisted"
#define FBP_MECHANICAL "mechanical"
#define FBP_DIGITAL "digital"
// Monkey and alien monkeys.
#define SPECIES_MONKEY "Monkey"
#define SPECIES_MONKEY_TAJ "Farwa"

8
code/game/jobs/job/captain.dm
View File

@@ -26,7 +26,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14)
ideal_character_age = 70 // Old geezer captains ftw
ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 55) /// Vatborn live shorter, no other race eligible for captain besides human/skrell
banned_job_species = list(SPECIES_UNATHI, SPECIES_TAJARAN, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "mechanical", "digital")
banned_job_species = list(SPECIES_UNATHI, SPECIES_TAJARAN, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_MECHANICAL, FBP_DIGITAL)
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN
@@ -91,10 +91,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
economic_modifier = 10
minimum_character_age = 25
min_age_by_species = list(SPECIES_UNATHI = 70, SPECIES_TESHARI = 20, "mechanical" = 10, SPECIES_HUMAN_VATBORN = 14)
min_age_by_species = list(SPECIES_UNATHI = 70, SPECIES_TESHARI = 20, FBP_MECHANICAL = 10, SPECIES_HUMAN_VATBORN = 14)
ideal_character_age = 50
ideal_age_by_species = list(SPECIES_UNATHI = 140, SPECIES_TESHARI = 27, "mechanical" = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_DIONA)
ideal_age_by_species = list(SPECIES_UNATHI = 140, SPECIES_TESHARI = 27, FBP_MECHANICAL = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_DIGITAL, SPECIES_DIONA)
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN

2
code/game/jobs/job/cargo.dm
View File

@@ -18,7 +18,7 @@
economic_modifier = 5
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
banned_job_species = list("digital", SPECIES_PROMETHEAN)
banned_job_species = list(FBP_DIGITAL, SPECIES_PROMETHEAN)
ideal_character_age = 40
dept_time_required = 20

2
code/game/jobs/job/civilian.dm
View File

@@ -237,7 +237,7 @@
access = list(access_lawyer, access_sec_doors, access_maint_tunnels, access_heads)
minimal_access = list(access_lawyer, access_sec_doors, access_heads)
minimal_player_age = 7
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, "digital")
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, FBP_DIGITAL)
outfit_type = /decl/hierarchy/outfit/job/internal_affairs_agent
job_description = "An " + JOB_INTERNAL_AFFAIRS_AGENT + " makes sure that the crew is following Standard Operating Procedure. They also \

6
code/game/jobs/job/engineering.dm
View File

@@ -17,10 +17,10 @@
economic_modifier = 10
minimum_character_age = 25
min_age_by_species = list(SPECIES_UNATHI = 70, "mechanical" = 10, SPECIES_HUMAN_VATBORN = 14)
min_age_by_species = list(SPECIES_UNATHI = 70, FBP_MECHANICAL = 10, SPECIES_HUMAN_VATBORN = 14)
ideal_character_age = 50
ideal_age_by_species = list(SPECIES_UNATHI = 140, "mechanical" = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital")
ideal_age_by_species = list(SPECIES_UNATHI = 140, FBP_MECHANICAL = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_DIGITAL)
disallow_jobhop = TRUE
pto_type = PTO_ENGINEERING

6
code/game/jobs/job/medical.dm
View File

@@ -25,11 +25,11 @@
alt_titles = list(JOB_ALT_CHIEF_PHYSICIAN = /datum/alt_title/chief_physician, JOB_ALT_MEDICAL_DIRECTOR = /datum/alt_title/medical_director, /*CHOMPEdit RemovalJOB_ALT_HEALTHCARE_MANAGER = /datum/alt_title/healthcare_manager*/)
minimum_character_age = 25
min_age_by_species = list(SPECIES_UNATHI = 70, "mechanical" = 10, SPECIES_HUMAN_VATBORN = 14)
min_age_by_species = list(SPECIES_UNATHI = 70, FBP_MECHANICAL = 10, SPECIES_HUMAN_VATBORN = 14)
minimal_player_age = 31 //ChompEDIT
ideal_character_age = 50
ideal_age_by_species = list(SPECIES_UNATHI = 140, "mechanical" = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital")
ideal_age_by_species = list(SPECIES_UNATHI = 140, FBP_MECHANICAL = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_DIGITAL)
disallow_jobhop = TRUE
pto_type = PTO_MEDICAL

12
code/game/jobs/job/science.dm
View File

@@ -28,10 +28,10 @@
minimum_character_age = 25
minimal_player_age = 31 //ChompEDIT
min_age_by_species = list(SPECIES_UNATHI = 70, "mechanical" = 10, SPECIES_HUMAN_VATBORN = 14)
min_age_by_species = list(SPECIES_UNATHI = 70, FBP_MECHANICAL = 10, SPECIES_HUMAN_VATBORN = 14)
ideal_character_age = 50
ideal_age_by_species = list(SPECIES_UNATHI = 140, "mechanical" = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital")
ideal_age_by_species = list(SPECIES_UNATHI = 140, FBP_MECHANICAL = 20, SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_DIGITAL)
disallow_jobhop = TRUE
pto_type = PTO_SCIENCE
dept_time_required = 60
@@ -78,7 +78,7 @@
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany)
minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list("digital")
banned_job_species = list(FBP_DIGITAL)
minimal_player_age = 3
@@ -156,7 +156,7 @@
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_hydroponics)
minimal_access = list(access_research, access_xenobiology, access_hydroponics, access_tox_storage)
banned_job_species = list("digital")
banned_job_species = list(FBP_DIGITAL)
minimal_player_age = 14
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
@@ -199,7 +199,7 @@
minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
minimal_player_age = 7
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list("digital")
banned_job_species = list(FBP_DIGITAL)
outfit_type = /decl/hierarchy/outfit/job/science/roboticist
job_description = "A " + JOB_ROBOTICIST + " maintains and repairs the station's synthetics, including crew with prosthetic limbs. \

2
code/game/jobs/job/security.dm
View File

@@ -28,7 +28,7 @@
minimal_player_age = 31 //ChompEDIT
ideal_character_age = 50
ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 20)
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_UNATHI, "mechanical")
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, FBP_DIGITAL, SPECIES_UNATHI, FBP_MECHANICAL)
disallow_jobhop = TRUE
pto_type = PTO_SECURITY
dept_time_required = 60

20
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -231,11 +231,11 @@ var/const/preview_icons = 'icons/mob/human_races/preview.dmi'
if(E.robotic < ORGAN_ASSISTED)
continue
if(I)
if(status == "assisted")
if(status == FBP_ASSISTED)
I.mechassist()
else if(status == "mechanical")
else if(status == FBP_MECHANICAL)
I.robotize()
else if(status == "digital")
else if(status == FBP_DIGITAL)
I.digitize()
for(var/N in character.organs_by_name)
@@ -931,9 +931,9 @@ var/const/preview_icons = 'icons/mob/human_races/preview.dmi'
pref.organ_data[other_limb] = "cyborg"
pref.rlimb_data[other_limb] = choice
if(!pref.organ_data[O_BRAIN])
pref.organ_data[O_BRAIN] = "assisted"
pref.organ_data[O_BRAIN] = FBP_ASSISTED
for(var/internal_organ in list(O_HEART,O_EYES))
pref.organ_data[internal_organ] = "mechanical"
pref.organ_data[internal_organ] = FBP_MECHANICAL
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -970,15 +970,15 @@ var/const/preview_icons = 'icons/mob/human_races/preview.dmi'
if("Normal")
pref.organ_data[zone] = null
if("Assisted")
pref.organ_data[zone] = "assisted"
pref.organ_data[zone] = FBP_ASSISTED
if("Cybernetic")
pref.organ_data[zone] = "assisted"
pref.organ_data[zone] = FBP_ASSISTED
if("Mechanical")
pref.organ_data[zone] = "mechanical"
pref.organ_data[zone] = FBP_MECHANICAL
if("Drone")
pref.organ_data[zone] = "digital"
pref.organ_data[zone] = FBP_DIGITAL
if("Positronic")
pref.organ_data[zone] = "mechanical"
pref.organ_data[zone] = FBP_MECHANICAL
return TOPIC_REFRESH_UPDATE_PREVIEW

6
code/modules/client/preference_setup/preference_setup.dm
View File

@@ -243,11 +243,11 @@
return 0 // Not a robot.
if(O_BRAIN in pref.organ_data)
switch(pref.organ_data[O_BRAIN])
if("assisted")
if(FBP_ASSISTED)
return PREF_FBP_CYBORG
if("mechanical")
if(FBP_MECHANICAL)
return PREF_FBP_POSI
if("digital")
if(FBP_DIGITAL)
return PREF_FBP_SOFTWARE
return 0 //Something went wrong!

4
code/modules/organs/organ.dm
View File

@@ -291,9 +291,9 @@ var/list/organ_cache = list()
handle_organ_mod_special()
if(!ignore_prosthetic_prefs && owner && owner.client && owner.client.prefs && owner.client.prefs.real_name == owner.real_name)
var/status = owner.client.prefs.organ_data[organ_tag]
if(status == "assisted")
if(status == FBP_ASSISTED)
mechassist()
else if(status == "mechanical")
else if(status == FBP_MECHANICAL)
robotize()
/obj/item/organ/proc/is_damaged()

6
code/modules/vore/persist/persist_vr.dm
View File

@@ -187,11 +187,11 @@
var/obj/item/organ/I = character.internal_organs_by_name[name]
if(I)
if(istype(I, /obj/item/organ/internal/mmi_holder/robot))
prefs.organ_data[name] = "digital" // Need a better way to detect this special type
prefs.organ_data[name] = FBP_DIGITAL // Need a better way to detect this special type
else if(I.robotic == ORGAN_ASSISTED)
prefs.organ_data[name] = "assisted"
prefs.organ_data[name] = FBP_ASSISTED
else if(I.robotic >= ORGAN_ROBOT)
prefs.organ_data[name] = "mechanical"
prefs.organ_data[name] = FBP_MECHANICAL
else
prefs.organ_data.Remove(name) // Missing organ_data entry means normal