cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes prosthetics editable in appearance editor (#18879)

Browse Source 
The appearance editor can now change organs and limbs into
prosthetic/nymph/amputated versions.
As ghostroles can now edit their own limbs, the Tarwa Conglomerate
ghostroles no longer have random nymph limbs.
Height and speech bubbles no longer need the user to be able to change
their species to modify them

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This commit is contained in:
RustingWithYou
2024-04-18 22:50:20 +00:00
committed by GitHub
co-authored by Matt Atlas
parent eb63f6998b
commit 8c4b86349d
18 changed files with 215 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/_internal.dm
+1 -1
View File
@@ -76,7 +76,7 @@
/obj/item/organ/internal/proc/special_condition() // For unique conditions
return
/obj/item/organ/internal/robotize(var/company = "Unbranded")
/obj/item/organ/internal/robotize(var/company = PROSTHETIC_UNBRANDED)
..()
min_bruised_damage += 5
min_broken_damage += 10
code/modules/organs/organ.dm
+7
View File
@@ -374,6 +374,13 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
if(robotic_name)
name = robotic_name
/obj/item/organ/proc/derobotize() //Turn a robot organ back into a flesh one. Used for appearance changers, etc.
robotic = initial(robotic)
status = initial(status)
drop_sound = initial(drop_sound)
pickup_sound = initial(pickup_sound)
name = initial(name)
/obj/item/organ/proc/mechassist() //Used to add things like pacemakers, etc
status = ORGAN_ASSISTED
robotic = ROBOTIC_ASSISTED
code/modules/organs/robolimbs.dm
+1 -1
View File
@@ -18,7 +18,7 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb)
/datum/robolimb
/// Shown when selecting the limb.
var/company = "Unbranded"
var/company = PROSTHETIC_UNBRANDED
/// Seen when examining a limb.
var/desc = "A generic unbranded robotic prosthesis."
/// Icon base to draw from.
code/modules/organs/subtypes/machine.dm
+11 -11
View File
@@ -628,17 +628,17 @@
dislocated = -1
can_intake_reagents = 0
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/chest/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/groin/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/groin/ipc/unbranded/cap // extreme nugget action
force_prosthetic_name = "prosthetic groin cap"
@@ -659,39 +659,39 @@
/obj/item/organ/external/arm/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/arm/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/leg/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/leg/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/foot/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/foot/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/hand/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED
/obj/item/organ/external/hand/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = PROSTHETIC_UNBRANDED