Merge branch 'Citadel-Station-13:master' into Projectile_Rework

This commit is contained in:
Solaris-Shade
2022-03-24 20:40:31 -04:00
committed by GitHub
2 changed files with 3 additions and 1 deletions
@@ -46,6 +46,8 @@
create_reagents(max_fuel)
reagents.add_reagent(/datum/reagent/fuel, max_fuel)
update_icon()
if(can_off_process)
START_PROCESSING(SSobj, src)
/obj/item/weldingtool/ComponentInitialize()
. = ..()
+1 -1
View File
@@ -145,7 +145,7 @@
partners -= L
if(iscarbon(L))
var/mob/living/carbon/C = L
if(!C.exposed_genitals.len && !C.is_groin_exposed() && !C.is_chest_exposed()) //Nothing through_clothing, no proper partner.
if(!C.exposed_genitals.len && !C.is_groin_exposed() && !C.is_chest_exposed() && C.is_mouth_covered()) //Nothing through_clothing, no proper partner.
partners -= C
//NOW the list should only contain correct partners
if(!partners.len)