Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

Adds nugget and corpse and lets nuggets move #851

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Adds nugget and corpse and lets nuggets move #851

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db7c2b6
adds nugget and corpse and lets nuggets move
KoboldCommando Dec 10, 2022
952628d
implements suggested changes
KoboldCommando Dec 16, 2022
75ba8ca
fixes cryptic variable name
KoboldCommando Jan 1, 2023
9907e80
updates and resolves merge conflict
KoboldCommando Mar 2, 2023
a2e55fe
these were staged im sure of it
KoboldCommando Mar 2, 2023
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
33 changes: 33 additions & 0 deletions code/datums/traits/negative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,39 @@
to_chat(quirk_holder, "<span class='boldannounce'>Your [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.</span>")

/datum/quirk/nugget
name = "Nugget"
desc = "An accident caused you to lose ALL of your limbs. There's no way your insurance payed for all those prosthetics!"
value = -1
var/slot_string = "limb"

/datum/quirk/nugget/on_spawn()
var/mob/living/carbon/human/nuggeted = quirk_holder
for(var/X in nuggeted.bodyparts)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
for(var/X in nuggeted.bodyparts)
for(var/obj/item/bodypart/BP in nuggeted.bodyparts)

There's a built-in type check, you don't need that second variable

Copy link
Collaborator

Choose a reason for hiding this comment

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

compiler would cry would it not? its calling a variable thats exclusive to a bodypart afterwards without an implicit type, unless byond is smart enough to see the listtype and not error out

var/obj/item/bodypart/BP = X
if(BP.body_part != HEAD && BP.body_part != CHEST)
if(BP.dismemberable)
BP.dismember()
if(nuggeted.buckled)
nuggeted.buckled.unbuckle_mob(nuggeted)
nuggeted.suppress_bloodloss(1800) //stop them from bleeding out
Copy link
Member

Choose a reason for hiding this comment

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

Is this a timed proc?
Or if it's not, does it have any affect on a living person that is then treated?

Copy link
Author

Choose a reason for hiding this comment

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

It simply de-limbs you upon spawn in comedic fashion. If you manage to get patched up, you can go on to have a normal round. If that's worth the 1 point, they can have at it, haha. Or if even that is a problem for some reason I can make it a 0 point quirk.

nuggeted.update_body_parts(TRUE)

/datum/quirk/nugget/post_add()
to_chat(quirk_holder, "<span class='boldannounce'>What cruel twist of fate has led to you arriving aboard a space station with no limbs?")

/datum/quirk/corpse
name = "Corpse"
desc = "Something terrible happened on the shuttle to the station, you arrive dead as a doornail!"
value = -1

/datum/quirk/corpse/post_add()
to_chat(quirk_holder, pick("<span class='boldannounce'>F", "<span class='boldannounce'>RIP", "<span class='boldannounce'>RIP in peace", "<span class='boldannounce'>RIP in pepperoni", "<span class='boldannounce'>You were THIS close to surviving"))
quirk_holder.adjustFireLoss(200)
quirk_holder.adjustBruteLoss(200)
quirk_holder.adjustToxLoss(200)
quirk_holder.adjustCloneLoss(200)
Copy link
Member

Choose a reason for hiding this comment

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

New quirks should be in the modular file at the bottom

Copy link
Member

Choose a reason for hiding this comment

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

How will they be revivable? I don't believe you can treat clone damage on a corpse and you can't defib at ~150 damage or so

Copy link
Author

Choose a reason for hiding this comment

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

Fixed, now it's just a shitload of brute.


/datum/quirk/pushover
name = "Pushover"
desc = "Your first instinct is always to let people push you around. Resisting out of grabs will take conscious effort."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@
var/knockdown = IsKnockdown()
var/ignore_legs = get_leg_ignore()
var/in_stasis = IsInStasis()
var/canmove = !IsImmobilized() && !stun && conscious && !paralyzed && !buckled && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && !in_stasis && (has_arms || ignore_legs || has_legs)
var/canmove = !IsImmobilized() && !stun && conscious && !paralyzed && !buckled && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && !in_stasis
Copy link
Member

Choose a reason for hiding this comment

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

This feels like it's going to change some things in a weird way, but I can't immediately say what

Copy link
Author

Choose a reason for hiding this comment

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

I think the weirdness is intentional: it lets nuggets crawl around now. I thought carefully and couldn't come up with anything else it would affect offhand.

Copy link
Collaborator

Choose a reason for hiding this comment

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

check wheelchair movement to make sure it doesn't just break them. Don't think it will but thats the only thing i can think of

if(canmove)
mobility_flags |= MOBILITY_MOVE
else
Expand Down