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.

Sign up for GitHub

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

Adds screenless IPCs #2513

Merged
merged 18 commits into from
Feb 10, 2024
Merged

Adds screenless IPCs #2513

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a103e74
barely did shit
rye-rice Nov 8, 2023
e116f5a
start2
rye-rice Nov 20, 2023
71ad28d
Merge remote-tracking branch 'upstream/master' into ipcs-but-good
rye-rice Nov 20, 2023
e3bee2f
yeag
rye-rice Nov 20, 2023
690e992
yeah
rye-rice Nov 21, 2023
bbb0ede
what the fuck
rye-rice Nov 21, 2023
19d07a6
AAAAAAAAAA
rye-rice Nov 21, 2023
16e8406
famsdhfjkads
rye-rice Nov 21, 2023
83a36cb
fawefae
rye-rice Nov 21, 2023
698bba4
fucking
rye-rice Nov 21, 2023
50b47a0
stg
rye-rice Nov 21, 2023
16320cf
SDFM<>KLN JUAHSGBKN<LJSUYHGBNVGMBY
rye-rice Nov 22, 2023
d3f9272
hell is real and its prefs code
rye-rice Nov 23, 2023
9c84ad7
Merge remote-tracking branch 'upstream/master' into ipcs-but-good
rye-rice Nov 27, 2023
6870919
Merge remote-tracking branch 'upstream/master' into ipcs-but-good
rye-rice Dec 22, 2023
9ce5dbc
got around to this
rye-rice Dec 22, 2023
64f4c0b
Merge remote-tracking branch 'upstream/master' into ipcs-but-good
rye-rice Jan 8, 2024
5f2ff05
LINTERS???? + more efficent sprite usage
rye-rice Jan 24, 2024
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
1 change: 1 addition & 0 deletions code/__HELPERS/global_lists.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/squid_face, GLOB.squid_face_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_tail, GLOB.ipc_tail_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/spider_legs, GLOB.spider_legs_list)
Expand Down
2 changes: 2 additions & 0 deletions code/__HELPERS/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
if(!GLOB.ipc_antennas_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
if(!GLOB.ipc_tail_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_tail_list)
if(!GLOB.ipc_chassis_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
if(!GLOB.spider_legs_list.len)
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/flavor_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ GLOBAL_LIST_EMPTY(moth_markings_list)
GLOBAL_LIST_EMPTY(squid_face_list)
GLOBAL_LIST_EMPTY(ipc_screens_list)
GLOBAL_LIST_EMPTY(ipc_antennas_list)
GLOBAL_LIST_EMPTY(ipc_tail_list)
GLOBAL_LIST_EMPTY(ipc_chassis_list)
GLOBAL_LIST_INIT(ipc_brain_list, list("Posibrain", "Man-Machine Interface"))
GLOBAL_LIST_EMPTY(spider_legs_list)
Expand Down
22 changes: 22 additions & 0 deletions code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"squid_face" = "Squidward",
"ipc_screen" = "Blue",
"ipc_antenna" = "None",
"ipc_tail" = "None",
"ipc_chassis" = "Morpheus Cyberkinetics (Custom)",
"ipc_brain" = "Posibrain",
"kepori_feathers" = "Plain",
Expand Down Expand Up @@ -673,6 +674,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "</td>"
mutant_category = 0

if("ipc_tail" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN

dat += "<h3>Tail Style</h3>"

dat += "<a href='?_src_=prefs;preference=ipc_tail;task=input'>[features["ipc_tail"]]</a><BR>"

mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += "</td>"
mutant_category = 0

if("ipc_chassis" in pref_species.default_features)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
Expand Down Expand Up @@ -1910,6 +1924,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_ipc_antenna)
features["ipc_antenna"] = new_ipc_antenna

if("ipc_tail")
var/new_ipc_tail

new_ipc_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.ipc_tail_list

if(new_ipc_tail)
features["ipc_tail"] = new_ipc_tail

if("ipc_chassis")
var/new_ipc_chassis

Expand Down
3 changes: 3 additions & 0 deletions code/modules/client/preferences_savefile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["feature_squid_face"], features["squid_face"])
READ_FILE(S["feature_ipc_screen"], features["ipc_screen"])
READ_FILE(S["feature_ipc_antenna"], features["ipc_antenna"])
READ_FILE(S["feature_ipc_tail"], features["ipc_tail"])
READ_FILE(S["feature_ipc_chassis"], features["ipc_chassis"])
READ_FILE(S["feature_ipc_brain"], features["ipc_brain"])
READ_FILE(S["feature_kepori_feathers"], features["kepori_feathers"])
Expand Down Expand Up @@ -538,6 +539,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
features["squid_face"] = sanitize_inlist(features["squid_face"], GLOB.squid_face_list, "Squidward")
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
features["ipc_tail"] = sanitize_inlist(features["ipc_tail"], GLOB.ipc_tail_list)
features["ipc_chassis"] = sanitize_inlist(features["ipc_chassis"], GLOB.ipc_chassis_list)
features["ipc_brain"] = sanitize_inlist(features["ipc_brain"], GLOB.ipc_brain_list)
features["kepori_feathers"] = sanitize_inlist(features["kepori_feathers"], GLOB.kepori_feathers_list, "Plain")
Expand Down Expand Up @@ -615,6 +617,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_squid_face"] , features["squid_face"])
WRITE_FILE(S["feature_ipc_screen"] , features["ipc_screen"])
WRITE_FILE(S["feature_ipc_antenna"] , features["ipc_antenna"])
WRITE_FILE(S["feature_ipc_tail"] , features["ipc_tail"])
WRITE_FILE(S["feature_ipc_chassis"] , features["ipc_chassis"])
WRITE_FILE(S["feature_ipc_brain"] , features["ipc_brain"])
WRITE_FILE(S["feature_kepori_feathers"] , features["kepori_feathers"])
Expand Down
81 changes: 81 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,71 @@
name = "Right Angle"
icon_state = "rangle"

/datum/sprite_accessory/ipc_antennas/sprinter
name = "Sprinter Tail"
icon_state = "sprinter"

/datum/sprite_accessory/ipc_antennas/simple
name = "Synth Simple"
icon_state = "simple_synth"

/datum/sprite_accessory/ipc_antennas/short
name = "Synth Short"
icon_state = "short_synth"

/datum/sprite_accessory/ipc_antennas/curled
name = "Synth Curled"
icon_state = "curled_synth"

/datum/sprite_accessory/ipc_antennas/ram //remade
name = "Synth Ram"
icon_state = "ram_synth"

// Start tails

/datum/sprite_accessory/ipc_tail
icon = 'icons/mob/ipc_accessories.dmi'
color_src = MUTCOLORS

/datum/sprite_accessory/ipc_tail/none
name = "None"
icon_state = "none"

/datum/sprite_accessory/ipc_tail/lizard
name = "Synthetic Sarathi"
icon_state = "synth"

/datum/sprite_accessory/ipc_tail/lizard_big
name = "Synthetic Sarathi Large"
icon_state = "large"

/datum/sprite_accessory/ipc_tail/plug
name = "Power Plug"
icon_state = "plug"
secondary_color = TRUE

/datum/sprite_accessory/ipc_tail/cat
name = "Pawsitrons Cat"
icon_state = "cat"

/datum/sprite_accessory/ipc_tail/fox
name = "Pawsitrons Fox"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't like these, doesn't feel very ipc to me

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not? besides,synths aren't very classic ipc-ey,either

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love them and I've seen a couple IPCs with them. They're very cool

icon_state = "fox"

/datum/sprite_accessory/ipc_tail/fox_alt
name = "Pawsitrons Fox 2"
icon_state = "fox2"

// Start chassis - the worst thing ever please rework this

/datum/sprite_accessory/ipc_chassis // Used for changing limb icons, doesn't need to hold the actual icon. That's handled in ipc.dm
icon = null
icon_state = "who cares fuck you" // In order to pull the chassis correctly, we need AN icon_state(see line 36-39). It doesn't have to be useful, because it isn't used.
color_src = 0
var/use_eyes = FALSE //do we use normal robotic eyes? used when we dont want a screen but still want visible eyes
var/has_screen = TRUE //do we have a screen to toggle
var/has_overlay = FALSE //does this chasis have a overlay icon?
var/is_digi = FALSE //does this chasis use digigrade
MarkSuckerberg marked this conversation as resolved.
Show resolved Hide resolved

/datum/sprite_accessory/ipc_chassis/mcgreyscale
name = "Morpheus Cyberkinetics (Custom)"
Expand Down Expand Up @@ -287,3 +346,25 @@
/datum/sprite_accessory/ipc_chassis/zenghupharmaceuticals
name = "Zeng-Hu Pharmaceuticals"
limbs_id = "zhpipc"

/datum/sprite_accessory/ipc_chassis/pgfmechanicsplantigrade
name = "PGF MECHANICS TYPE-P"
limbs_id = "pgfipc-p"
has_screen = FALSE
color_src = MUTCOLORS
has_overlay = TRUE
use_eyes = TRUE

/datum/sprite_accessory/ipc_chassis/pgfmechanicsdigigrade
name = "PGF MECHANICS TYPE-D"
limbs_id = "pgfipc-d"
has_screen = FALSE
color_src = MUTCOLORS
has_overlay = TRUE
use_eyes = TRUE
is_digi = TRUE

/datum/sprite_accessory/ipc_chassis/inteqsprinter
name = "Inteq Mothership 'Sprinter'"
limbs_id = "inteqsprinter"
has_screen = FALSE
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
if("ipc_antenna")
S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
if("ipc_tail")
S = GLOB.ipc_tail_list[H.dna.features["ipc_tail"]]
if("ipc_chassis")
S = GLOB.ipc_chassis_list[H.dna.features["ipc_chassis"]]
if("ipc_brain")
Expand Down
49 changes: 45 additions & 4 deletions code/modules/mob/living/carbon/human/species_types/IPC.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
mutantlungs = null //no more collecting change for you
mutantappendix = null
mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord)
mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_brain")
default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_brain" = "Posibrain", "body_size" = "Normal")
mutant_bodyparts = list("ipc_screen", "ipc_antenna", "ipc_chassis", "ipc_tail", "ipc_brain")
default_features = list("mcolor" = "#7D7D7D", "ipc_screen" = "Static", "ipc_antenna" = "None", "ipc_chassis" = "Morpheus Cyberkinetics (Custom)", "ipc_tail" = "None", "ipc_brain" = "Posibrain", "body_size" = "Normal")
meat = /obj/item/stack/sheet/plasteel{amount = 5}
skinned_type = /obj/item/stack/sheet/metal{amount = 10}
exotic_bloodtype = "Coolant"
Expand Down Expand Up @@ -49,6 +49,7 @@
/// The last screen used when the IPC died.
var/saved_screen
var/datum/action/innate/change_screen/change_screen
var/has_screen = TRUE //do we have a screen. Used to determine if we mess with the screen or not

/datum/species/ipc/random_name(unique)
var/ipc_name = "[pick(GLOB.posibrain_names)]-[rand(100, 999)]"
Expand Down Expand Up @@ -83,6 +84,8 @@
C.UnregisterSignal(C, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)

/datum/species/ipc/spec_death(gibbed, mob/living/carbon/C)
if(!has_screen)
return
saved_screen = C.dna.features["ipc_screen"]
C.dna.features["ipc_screen"] = "BSOD"
C.update_body()
Expand All @@ -91,6 +94,8 @@
/datum/species/ipc/proc/post_death(mob/living/carbon/C)
if(C.stat < DEAD)
return
if(!has_screen)
return
C.dna.features["ipc_screen"] = null // Turns off their monitor on death.
C.update_body()

Expand All @@ -110,6 +115,11 @@
if(!ishuman(owner))
return
var/mob/living/carbon/human/H = owner
var/datum/species/ipc/species_datum = H.dna.species
MarkSuckerberg marked this conversation as resolved.
Show resolved Hide resolved
if(!species_datum)
return
if(!species_datum.has_screen)
return
H.dna.features["ipc_screen"] = screen_choice
H.eye_color = sanitize_hexcolor(color_choice)
H.update_body()
Expand Down Expand Up @@ -215,14 +225,17 @@


/datum/species/ipc/spec_revival(mob/living/carbon/human/H)
H.dna.features["ipc_screen"] = "BSOD"
H.update_body()
if(has_screen)
H.dna.features["ipc_screen"] = "BSOD"
H.update_body()
H.say("Reactivating [pick("core systems", "central subroutines", "key functions")]...")
addtimer(CALLBACK(src, PROC_REF(post_revival), H), 6 SECONDS)

/datum/species/ipc/proc/post_revival(mob/living/carbon/human/H)
if(H.stat == DEAD)
return
if(!has_screen)
return
H.dna.features["ipc_screen"] = saved_screen
H.update_body()

Expand All @@ -231,12 +244,40 @@

var/datum/sprite_accessory/ipc_chassis/chassis_of_choice = GLOB.ipc_chassis_list[C.dna.features["ipc_chassis"]]

if(chassis_of_choice.use_eyes)
LAZYREMOVE(species_traits, NOEYESPRITES)
LAZYADD(species_traits, EYECOLOR)
C.update_body()

if(!chassis_of_choice.has_screen)
has_screen = FALSE
change_screen.Remove()
C.dna.features["ipc_screen"] = null
C.update_body()

if(chassis_of_choice.is_digi)
digitigrade_customization = DIGITIGRADE_FORCED
bodytype = BODYTYPE_DIGITIGRADE

for(var/obj/item/bodypart/BP as anything in C.bodyparts) //Override bodypart data as necessary
if(BP.limb_id=="synth")
BP.uses_mutcolor = chassis_of_choice.color_src ? TRUE : FALSE

if(chassis_of_choice.icon)
BP.static_icon = chassis_of_choice.icon
BP.icon = chassis_of_choice.icon

if(chassis_of_choice.has_overlay)
BP.overlay_icon_state = TRUE

if(chassis_of_choice.is_digi)
if(istype(BP,/obj/item/bodypart/leg))
BP.bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE //i hate this so much

if(BP.uses_mutcolor)
BP.should_draw_greyscale = TRUE
BP.species_color = C.dna?.features["mcolor"]
BP.species_secondary_color = C.dna?.features["mcolor2"]

BP.limb_id = chassis_of_choice.limbs_id
BP.name = "\improper[chassis_of_choice.name] [parse_zone(BP.body_zone)]"
Expand Down
1 change: 1 addition & 0 deletions code/modules/surgery/organs/eyes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
/obj/item/organ/eyes/robotic
name = "robotic eyes"
icon_state = "robotic_eyes"
eye_icon_state = "eyes_synth" // i feel like this should be here
desc = "A very basic set of optical sensors with no extra vision modes or functions."
status = ORGAN_ROBOTIC
organ_flags = ORGAN_SYNTHETIC
Expand Down
Binary file modified icons/mob/ipc_accessories.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/species/ipc/bodyparts.dmi
View file
Open in desktop
Binary file not shown.
Loading