cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-05 13:07:11 -05:00
committed by GitHub
parent 9b4f0cde71
commit be60f7e039
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/resleeving/machines.dm
View File

@@ -616,9 +616,8 @@
occupant.confused = max(occupant.confused, confuse_amount) occupant.confused = max(occupant.confused, confuse_amount)
occupant.eye_blurry = max(occupant.eye_blurry, blur_amount) occupant.eye_blurry = max(occupant.eye_blurry, blur_amount)
<<<<<<< HEAD
=======
/* // CHOMPstation removal
// Vore deaths get a fake modifier labeled as such // Vore deaths get a fake modifier labeled as such
if(!occupant.mind) if(!occupant.mind)
log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.") log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.")
@@ -629,7 +628,7 @@
// Normal ones get a normal modifier to nerf charging into combat // Normal ones get a normal modifier to nerf charging into combat
else else
occupant.add_modifier(/datum/modifier/resleeving_sickness, sickness_duration) occupant.add_modifier(/datum/modifier/resleeving_sickness, sickness_duration)
>>>>>>> 19b662e943... Merge pull request #11939 from Heroman3003/nmensayfix */ // CHOMPedit end
if(occupant.mind && occupant.original_player && ckey(occupant.mind.key) != occupant.original_player) if(occupant.mind && occupant.original_player && ckey(occupant.mind.key) != occupant.original_player)
log_and_message_admins("is now a cross-sleeved character. Body originally belonged to [occupant.real_name]. Mind is now [occupant.mind.name].",occupant) log_and_message_admins("is now a cross-sleeved character. Body originally belonged to [occupant.real_name]. Mind is now [occupant.mind.name].",occupant)