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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fluff Augments #905

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
3 changes: 3 additions & 0 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@
#define ORGAN_SLOT_CELL "cell"
#define ORGAN_SLOT_EARS "ears"
#define ORGAN_SLOT_EYES "eye_sight"
#define ORGAN_SLOT_FLUFF_HEAD "fluff_head"
#define ORGAN_SLOT_FLUFF_CHEST "fluff_chest"
#define ORGAN_SLOT_FLUFF_GROIN "fluff_groin"
#define ORGAN_SLOT_HEART "heart"
#define ORGAN_SLOT_HEART_AID "heartdrive"
#define ORGAN_SLOT_HUD "eye_hud"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/augments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
#define AUGMENT_SLOT_STOMACH "Stomach"
#define AUGMENT_SLOT_EYES "Eyes"
#define AUGMENT_SLOT_TONGUE "Tongue"
#define AUGMENT_SLOT_FLUFF_HEAD "Minor Head Augment"
#define AUGMENT_SLOT_FLUFF_CHEST "Minor Chest Augment"
#define AUGMENT_SLOT_FLUFF_GROIN "Minor Groin Augment"
Comment on lines +22 to +24
Copy link
Member

Choose a reason for hiding this comment

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

I don't like this but I also don't have any better ideas.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I originally was going to use the implant system but it turned out using that would have been much more scuffed

I don't know of any way off adding these without it being scuffed other than adding a completely new system, which would feel like bloating character customization


//Implants
#define AUGMENT_CATEGORY_IMPLANTS "Implants"
Expand Down
39 changes: 39 additions & 0 deletions code/modules/client/preferences/augments/augment_organ.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,42 @@
/datum/augment_item/organ/tongue/forked
name = "Forked"
path = /obj/item/organ/tongue/lizard

//FLUFF
/datum/augment_item/organ/fluff

/datum/augment_item/organ/fluff/head
name = "None"
slot = AUGMENT_SLOT_FLUFF_HEAD

/datum/augment_item/organ/fluff/head/circadian_conditioner
name = "Circadnian Conditioner"
path = /obj/item/organ/cyberimp/fluff/circadian_conditioner

/datum/augment_item/organ/fluff/chest
name = "None"
slot = AUGMENT_SLOT_FLUFF_CHEST

/datum/augment_item/organ/fluff/chest/genetic_backup
name = "Genetic Backup"
path = /obj/item/organ/cyberimp/fluff/genetic_backup

/datum/augment_item/organ/fluff/chest/emergency_battery
name = "Emergency Battery"
path = /obj/item/organ/cyberimp/fluff/emergency_battery

/datum/augment_item/organ/fluff/chest/skeletal_bracing
name = "Skeletal Bracing"
path = /obj/item/organ/cyberimp/fluff/skeletal_bracing

/datum/augment_item/organ/fluff/chest/ultraviolet_shielding
name = "Ultraviolet Shield"
path = /obj/item/organ/cyberimp/fluff/ultraviolet_shielding

/datum/augment_item/organ/fluff/groin
name = "None"
slot = AUGMENT_SLOT_FLUFF_GROIN

/datum/augment_item/organ/fluff/groin/recycler_suite
name = "Recycler Suite"
path = /obj/item/organ/cyberimp/fluff/recycler_suite
51 changes: 51 additions & 0 deletions code/modules/surgery/organs/augments_fluff.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/obj/item/organ/cyberimp/fluff
cosmetic_only = TRUE
icon_state = "chest_implant"
relative_size = 0 //to prevent fluff organs from affecting combat at all

/obj/item/organ/cyberimp/fluff/circadian_conditioner
name = "circadian conditioner"
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_FLUFF_HEAD
icon_state = "brain_implant"
desc = "A small brain implant that carefully regulates the output of certain hormones to assist in controlling the sleep-wake cycle of its owner. May be an effective counter to insomnia, jet lag, and late-night work shifts."


/obj/item/organ/cyberimp/fluff/genetic_backup
name = "genetic backup"
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_FLUFF_CHEST
icon_state = "brain_implant"
desc = "This implant is a compact and resilient solid-state drive. It does nothing on its own, but contains the complete DNA sequence of its owner - whether it be to aid in medical treatment, serve for research purposes, or even be used as a template for vat-grown humans in the future."


/obj/item/organ/cyberimp/fluff/emergency_battery
name = "emergency battery"
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_FLUFF_CHEST
icon_state = "cell"
desc = "A small emergency power supply. It provides no protection from power loss on its own, but might help keep your brain ticking through an otherwise critical failure."

/obj/item/organ/cyberimp/fluff/skeletal_bracing
name = "skeletal bracing"
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_FLUFF_CHEST
icon_state = "implant-reinforcers"
desc = "Mechanical hinges and springs made from titanium or some other bio-compatible metal reinforce your joints, generally making strenuous activity less painful for you and allowing you to carry weight that would normally be unbearable. It provides no increase on strength on its own, unless you have weak bones to begin with."


/obj/item/organ/cyberimp/fluff/ultraviolet_shielding
name = "ultraviolet shielding"
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_FLUFF_CHEST
icon_state = "implant-reinforcers2"
desc = "Some parts of your epidermis have been replaced with a bio-engineered substitute that's resistant to harmful solar radiation - a common factor in the lives of spacers or inhabitants of planets with a weak magnetosphere."

/obj/item/organ/cyberimp/fluff/recycler_suite
name = "recycler suite"
zone = BODY_ZONE_PRECISE_GROIN
slot = ORGAN_SLOT_FLUFF_GROIN
food_reagents = list(/datum/reagent/consumable/nutraslop = 5, /datum/reagent/iron = 3) //do you really want to eat this?
icon_state = "random_fly_5"
desc = "In extreme environments where natural resources are limited or even nonexistent, it may be prudent to recycle nutrients and fluids the body would usually discard. This system reclaims any usable material in the digestive tract that would otherwise be lost to waste."
organ_flags = ORGAN_EDIBLE | ORGAN_SYNTHETIC
1 change: 1 addition & 0 deletions daedalus.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4357,6 +4357,7 @@
#include "code\modules\surgery\organs\augments_chest.dm"
#include "code\modules\surgery\organs\augments_eyes.dm"
#include "code\modules\surgery\organs\augments_internal.dm"
#include "code\modules\surgery\organs\augments_fluff.dm"
#include "code\modules\surgery\organs\autosurgeon.dm"
#include "code\modules\surgery\organs\cell.dm"
#include "code\modules\surgery\organs\ears.dm"
Expand Down
Loading