cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-12 08:27:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump dreamchecker version to 1.4 (#8711)

Browse Source
This commit is contained in:
Matt Atlas
2020-04-28 15:41:32 +02:00
committed by GitHub
parent a0938b98c7
commit 4b97822bb4
88 changed files with 153 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+2 -2
View File
@@ -925,12 +925,12 @@ Note that amputating the affected organ does in fact remove the infection from t
holder = owner
if(!holder)
return
if (holder.handcuffed && body_part in list(ARM_LEFT, ARM_RIGHT, HAND_LEFT, HAND_RIGHT))
if (holder.handcuffed && (body_part in list(ARM_LEFT, ARM_RIGHT, HAND_LEFT, HAND_RIGHT)))
holder.visible_message(\
"\The [holder.handcuffed.name] falls off of [holder.name].",\
"\The [holder.handcuffed.name] falls off you.")
holder.drop_from_inventory(holder.handcuffed)
if (holder.legcuffed && body_part in list(FOOT_LEFT, FOOT_RIGHT, LEG_LEFT, LEG_RIGHT))
if (holder.legcuffed && (body_part in list(FOOT_LEFT, FOOT_RIGHT, LEG_LEFT, LEG_RIGHT)))
holder.visible_message(\
"\The [holder.legcuffed.name] falls off of [holder.name].",\
"\The [holder.legcuffed.name] falls off you.")
code/modules/organs/subtypes/vaurca.dm
+1 -1
View File
@@ -210,7 +210,7 @@ obj/item/organ/vaurca/neuralsocket/process()
else if(src in location) // or if tank is in the mobs possession
if(!location.internal) // and they do not have any active internals
mask_check = 1
else if(istype(src.loc, /obj/item/rig) && src.loc in location) // or the rig is in the mobs possession
else if(istype(src.loc, /obj/item/rig) && (src.loc in location)) // or the rig is in the mobs possession
if(!location.internal) // and they do not have any active internals
mask_check = 1