cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors Regenerate Organs, and a few organ helpers [MDB IGNORE] (#20094)

Browse Source 
* Refactors Regenerate Organs, and a few organ helpers

* MERGE CONFLICTS

* GETORGANSLOT > GET_ORGAN_SLOT

* GETORGAN > get_organ_by_type

* lint repairs

* more lint

* Update tgstation.dme

* Update surgery_step.dm

---------

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-04-01 02:51:06 +01:00
committed by GitHub
co-authored by Zephyr Gandalf
parent 3c4c1ade1e
commit 3464b6bfb2
267 changed files with 935 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paperplane.dm
+5 -6
View File
@@ -57,12 +57,12 @@
return ..()
/obj/item/paperplane/suicide_act(mob/living/user)
var/obj/item/organ/internal/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES)
var/obj/item/organ/internal/eyes/eyes = user.get_organ_slot(ORGAN_SLOT_EYES)
user.Stun(200)
user.visible_message(span_suicide("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!"))
user.adjust_eye_blur(12 SECONDS)
if(eyes)
eyes.applyOrganDamage(rand(impact_eye_damage_lower, impact_eye_damage_higher)) // SKYRAT EDIT START - Better paper planes
eyes.apply_organ_damage(rand(impact_eye_damage_lower, impact_eye_damage_higher)) // SKYRAT EDIT START - Better paper planes
sleep(1 SECONDS)
return BRUTELOSS
@@ -117,7 +117,7 @@
// SKYRAT EDIT END
return
var/mob/living/carbon/human/H = hit_atom
var/obj/item/organ/internal/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
var/obj/item/organ/internal/eyes/eyes = H.get_organ_slot(ORGAN_SLOT_EYES)
if(prob(hit_probability))
if(H.is_eyes_covered())
// SKYRAT EDIT START - Better paper planes
@@ -127,9 +127,8 @@
return
visible_message(span_danger("\The [src] hits [H] in the eye[eyes ? "" : " socket"]!"))
H.adjust_eye_blur(12 SECONDS)
// SKYRAT EDIT START - Better paper planes
eyes?.applyOrganDamage(rand(impact_eye_damage_lower, impact_eye_damage_higher))
H.Knockdown(knockdown_duration)
eyes?.apply_organ_damage(rand(impact_eye_damage_lower, impact_eye_damage_higher))
H.Knockdown(40)
H.emote("scream")
if(delete_on_impact)