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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Slimepeople! (TM For Now) #220

Merged
merged 27 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e1849a7
base
Nerev4r Nov 10, 2024
558d303
oh my goodness gracious
Nerev4r Nov 10, 2024
58eb4bd
closer yet closer
Nerev4r Nov 13, 2024
c6bc353
wew
Nerev4r Nov 13, 2024
2231dc9
progress
Nerev4r Nov 14, 2024
c99d08c
deploying goo
Nerev4r Nov 15, 2024
dd04507
feed me a stray cat
Nerev4r Nov 15, 2024
71979a0
Merge branch 'master' of https://github.com/DopplerShift13/DopplerShi…
Nerev4r Nov 16, 2024
3d77791
shoutout to lobster
Nerev4r Nov 16, 2024
f18055f
yippee yay
Nerev4r Nov 16, 2024
0083818
it's bleak
Nerev4r Nov 16, 2024
a171b4f
getting some neck
Nerev4r Nov 16, 2024
2a25c9a
thanks to sigma predator for sponsoring this video
Nerev4r Nov 16, 2024
4520ff0
delirious
Nerev4r Nov 16, 2024
ea86cdd
p's and q's
Nerev4r Nov 16, 2024
20d172e
until later
Nerev4r Nov 20, 2024
3376769
Merge branch 'master' of https://github.com/DopplerShift13/DopplerShi…
Nerev4r Nov 29, 2024
c42c7b2
awawawawa
Nerev4r Nov 29, 2024
ed061d4
Merge branch 'master' of https://github.com/DopplerShift13/DopplerShi…
Nerev4r Dec 1, 2024
979fae2
Merge branch 'master' of https://github.com/DopplerShift13/DopplerShi…
Nerev4r Dec 4, 2024
82cc49e
ough
Nerev4r Dec 4, 2024
49c99fa
come on
Nerev4r Dec 4, 2024
a13cf2a
collect my pages
Nerev4r Dec 4, 2024
028d585
Merge branch 'master' of https://github.com/DopplerShift13/DopplerShi…
Nerev4r Dec 17, 2024
a4ddeae
fixes splatter element. adds markings on regen function
carpotoxin Jan 8, 2025
abdd0f7
screenshots
carpotoxin Jan 8, 2025
8e916d1
oops
carpotoxin Jan 8, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
consumed_limb.drop_limb()
to_chat(H, span_userdanger("Your [consumed_limb] is drawn back into your body, unable to maintain its shape!"))
qdel(consumed_limb)
H.blood_volume += 20
H.blood_volume += 65 //DOPPLER EDIT - CHANGE - ORIGINAL: 20 - This is because losing a limb now costs them 60 blood, so this refunds it with a pinch extra so it doesn't. Y'know. Kill you.

/datum/species/jelly/get_species_description()
return "Jellypeople are a strange and alien species with three eyes, made entirely out of gel."
Expand Down
6 changes: 5 additions & 1 deletion code/modules/surgery/organ_manipulation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,12 @@
)
display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain, you can't feel your [target_organ.name] anymore!")
log_combat(user, target, "surgically removed [target_organ.name] from", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
///DOPPLER EDIT BEGIN - Makes slime core ejection properly work.
var/atom/drop_loc = target.drop_location()
target_organ.Remove(target)
target_organ.forceMove(get_turf(target))
if(drop_loc)
target_organ.forceMove(drop_loc)
///DOPPLER EDIT END
target_organ.on_surgical_removal(user, target, target_zone, tool)
else
display_results(
Expand Down
Loading
Loading