cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shadekin related fixes (#8017)

Browse Source
This commit is contained in:
Guti
2024-03-21 13:54:22 +01:00
committed by GitHub
parent f721eeae8e
commit 4178003f01
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/item_attack.dm
View File

@@ -96,6 +96,8 @@ avoid code duplication. This includes items that may sometimes act as a standard
return 0 return 0
if(M == user && user.a_intent != I_HURT) if(M == user && user.a_intent != I_HURT)
return 0 return 0
if(M.is_incorporeal()) // CHOMPEdit - No attacking phased entities :)
return 0
///////////////////////// /////////////////////////
user.lastattacked = M user.lastattacked = M

2
code/game/objects/effects/effect_system.dm
View File

@@ -199,6 +199,8 @@ steam.start() -- spawns the effect
return 0 return 0
if(istype(M,/mob/living/carbon/human)) if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(!M.get_organ(O_LUNGS)) // CHOMPedit - Making sure smoke doesn't affect lungless people
return 0
if(H.head && (H.head.item_flags & AIRTIGHT)) if(H.head && (H.head.item_flags & AIRTIGHT))
return 0 return 0
return 1 return 1

2
code/game/objects/weapons.dm
View File

@@ -37,8 +37,6 @@
continue continue
if(!attack_can_reach(user, SM, 1)) if(!attack_can_reach(user, SM, 1))
continue continue
if(SM.is_incorporeal()) // CHOMPADD - Don't cleave phased entities.
continue
if(resolve_attackby(SM, user, attack_modifier = 0.5)) // Hit them with the weapon. This won't cause recursive cleaving due to the cleaving variable being set to true. if(resolve_attackby(SM, user, attack_modifier = 0.5)) // Hit them with the weapon. This won't cause recursive cleaving due to the cleaving variable being set to true.
hit_mobs++ hit_mobs++

1
code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
View File

@@ -164,6 +164,7 @@
H.adjustBruteLoss(-(H.getBruteLoss() * 0.75)) H.adjustBruteLoss(-(H.getBruteLoss() * 0.75))
H.adjustToxLoss(-(H.getToxLoss() * 0.75)) H.adjustToxLoss(-(H.getToxLoss() * 0.75))
H.adjustCloneLoss(-(H.getCloneLoss() * 0.75)) H.adjustCloneLoss(-(H.getCloneLoss() * 0.75))
H.germ_level = 0 // CHOMPAdd - Take away the germs, or we'll die AGAIN
H.vessel.add_reagent("blood",blood_volume-H.vessel.total_volume) H.vessel.add_reagent("blood",blood_volume-H.vessel.total_volume)
for(var/obj/item/organ/external/bp in H.organs) for(var/obj/item/organ/external/bp in H.organs)
bp.bandage() bp.bandage()

2
code/modules/mob/living/living_movement.dm
View File

@@ -48,7 +48,7 @@ default behaviour is:
return 0 return 0
/mob/living/Bump(atom/movable/AM) /mob/living/Bump(atom/movable/AM)
if(now_pushing || !loc || buckled == AM) if(now_pushing || !loc || buckled == AM || AM.is_incorporeal()) // CHOMPEdit - This should take care of phase interactions...
return return
now_pushing = 1 now_pushing = 1
if (istype(AM, /mob/living)) if (istype(AM, /mob/living))

4
code/modules/vore/resizing/resize_vr.dm
View File

@@ -237,8 +237,6 @@
var/datum/sprite_accessory/tail/taur/tail = H.tail_style var/datum/sprite_accessory/tail/taur/tail = H.tail_style
src_message = tail.msg_owner_help_run src_message = tail.msg_owner_help_run
tmob_message = tail.msg_prey_help_run tmob_message = tail.msg_prey_help_run
if(tmob.is_incorporeal()) // CHOMPEdit - Nothing to step over.
return TRUE
//Smaller person stepping under larger person //Smaller person stepping under larger person
else if(get_effective_size(TRUE) < tmob.get_effective_size(TRUE) && ishuman(tmob)) else if(get_effective_size(TRUE) < tmob.get_effective_size(TRUE) && ishuman(tmob))
@@ -249,8 +247,6 @@
var/datum/sprite_accessory/tail/taur/tail = H.tail_style var/datum/sprite_accessory/tail/taur/tail = H.tail_style
src_message = tail.msg_prey_stepunder src_message = tail.msg_prey_stepunder
tmob_message = tail.msg_owner_stepunder tmob_message = tail.msg_owner_stepunder
if(tmob.is_incorporeal()) // CHOMPEdit - Can't run between what's not there
return TRUE
if(src_message) if(src_message)
to_chat(src, "<span class='filter_notice'>[STEP_TEXT_OWNER(src_message)]</span>") to_chat(src, "<span class='filter_notice'>[STEP_TEXT_OWNER(src_message)]</span>")