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

[MIRROR] fix protean rig noms (#9618)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-11 00:17:53 -07:00
committed by GitHub
parent d18cb976cd
commit b6bb12d09e
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
View File

@@ -314,7 +314,7 @@
//// ////
// Rig Transform // Rig Transform
//// ////
/mob/living/carbon/human/proc/nano_rig_transform(var/forced) /mob/living/carbon/human/proc/nano_rig_transform(var/forced, var/devour = FALSE)
set name = "Modify Form - Hardsuit" set name = "Modify Form - Hardsuit"
set desc = "Allows a protean to retract its mass into its hardsuit module at will." set desc = "Allows a protean to retract its mass into its hardsuit module at will."
//set category = "Abilities.Protean" //set category = "Abilities.Protean"
@@ -337,14 +337,15 @@
var/mob/living/simple_mob/protean_blob/P = temporary_form var/mob/living/simple_mob/protean_blob/P = temporary_form
if(S.OurRig) //Do we even have a RIG? if(S.OurRig) //Do we even have a RIG?
if(P.loc == S.OurRig) //we're inside our own RIG if(P.loc == S.OurRig) //we're inside our own RIG
var/mob/wearer = S.OurRig.wearer
if(ismob(S.OurRig.loc)) if(ismob(S.OurRig.loc))
var/mob/m = S.OurRig.loc var/mob/m = S.OurRig.loc
m.drop_from_inventory(S.OurRig) m.drop_from_inventory(S.OurRig)
if(S.OurRig.wearer) //We're being worn. Engulf em', if prefs align.. otherwise just drop off. if(wearer && devour) //We're being worn. Engulf em', if prefs align.. otherwise just drop off.
var/mob/living/carbon/human/victim = S.OurRig.wearer if(P.can_be_drop_pred && wearer.devourable && wearer.can_be_drop_prey && P.vore_selected)
if(P.can_be_drop_pred && victim.devourable && victim.can_be_drop_prey) perform_the_nom(P,wearer,P,P.vore_selected,1)
if(P.vore_selected) else
perform_the_nom(P,victim,P,P.vore_selected,1) to_chat(P, span_vwarning("You can't assimilate your current host."))
P.forceMove(get_turf(S.OurRig)) P.forceMove(get_turf(S.OurRig))
S.OurRig.forceMove(src) S.OurRig.forceMove(src)
S.OurRig.myprotean = src S.OurRig.myprotean = src
@@ -614,14 +615,7 @@
if(!target) if(!target)
to_chat(protie, span_vwarning("You need a host to assimilate.")) to_chat(protie, span_vwarning("You need a host to assimilate."))
return return
if(!protie.can_be_drop_pred || !target.can_be_drop_prey || !target.devourable) nano_rig_transform(TRUE, TRUE)
to_chat(protie, span_vwarning("You can't assimilate your current host."))
return
target.drop_from_inventory(S.OurRig)
to_chat(protie, span_vnotice("You assimilate your host."))
to_chat(target, span_vwarning("You feel yourself sink deeper into the suit!"))
target.forceMove(protie.vore_selected)
nano_blobform(TRUE)
/// /// /// A helper to reuse /// /// /// A helper to reuse
/mob/living/proc/nano_get_refactory(obj/item/organ/internal/nano/refactory/R) /mob/living/proc/nano_get_refactory(obj/item/organ/internal/nano/refactory/R)