cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes body collision to knockdown, adds a throw_range of 4 to carbon/human (#18363)

Browse Source 
* Begone Weaken()

* throw range

* little spacin is good

* requested changes are changed
This commit is contained in:
Contrabang
2022-07-15 07:16:23 -07:00
committed by GitHub
parent 6eec8f9115
commit 813e88a8cb
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+10 -7
View File
@@ -556,7 +556,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
//Throwing stuff
/mob/living/carbon/throw_impact(atom/hit_atom, throwingdatum)
/mob/living/carbon/throw_impact(atom/hit_atom, throwingdatum, speed = 1)
. = ..()
if(has_status_effect(STATUS_EFFECT_CHARGING))
var/hit_something = FALSE
@@ -587,6 +587,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return
var/hurt = TRUE
var/damage = 10 + 1.5 * speed // speed while thrower is standing still is 2, while walking with an aggressive grab is 2.4, highest speed is 14
/*if(istype(throwingdatum, /datum/thrownthing))
var/datum/thrownthing/D = throwingdatum
if(isrobot(D.thrower))
@@ -595,17 +596,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
hurt = FALSE*/
if(hit_atom.density && isturf(hit_atom))
if(hurt)
Weaken(2 SECONDS)
take_organ_damage(10)
visible_message("<span class='danger'>[src] slams into [hit_atom]!</span>", "<span class='userdanger'>You slam into [hit_atom]!</span>")
take_organ_damage(damage)
KnockDown(3 SECONDS)
playsound(src, 'sound/weapons/punch1.ogg', 35, 1)
if(iscarbon(hit_atom) && hit_atom != src)
var/mob/living/carbon/victim = hit_atom
if(victim.flying)
return
if(hurt)
victim.take_organ_damage(10)
take_organ_damage(10)
victim.Weaken(2 SECONDS)
Weaken(2 SECONDS)
victim.take_organ_damage(damage)
take_organ_damage(damage)
victim.KnockDown(3 SECONDS)
KnockDown(3 SECONDS)
visible_message("<span class='danger'>[src] crashes into [victim], knocking them both over!</span>", "<span class='userdanger'>You violently crash into [victim]!</span>")
playsound(src, 'sound/weapons/punch1.ogg', 50, 1)
code/modules/mob/living/carbon/human/human.dm
+1
View File
@@ -6,6 +6,7 @@
icon_state = "body_m_s"
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
deathgasp_on_death = TRUE
throw_range = 4
/mob/living/carbon/human/New(loc)
icon = null // This is now handled by overlays -- we just keep an icon for the sake of the map editor.