shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some runtimes and issues.

Browse Source
This commit is contained in:
Ghommie
2020-05-08 17:17:33 +02:00
parent 5e0235bd76
commit 90bf157f5e
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/helmet.dm
+1 -1
View File
@@ -273,7 +273,7 @@
//LightToggle
/obj/item/clothing/head/helment/ComponentInitialize()
/obj/item/clothing/head/helmet/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
code/modules/clothing/spacesuits/hardsuit.dm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/dropped(mob/user)
..()
if(suit)
if(suit && !ismob(loc)) //equipped() will handle mob cases, so it doesn't disengage twice.
suit.RemoveHelmet()
soundloop.stop(user)
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -340,7 +340,7 @@
if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
to_chat(M, "<span class='warning'>You can't bite with your mouth covered!</span>")
return FALSE
if(run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, M, check_zone(M.zone_selected)) & BLOCK_SUCCESS)
if(run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, 0, M, check_zone(M.zone_selected)) & BLOCK_SUCCESS)
return FALSE
M.do_attack_animation(src, ATTACK_EFFECT_BITE)
if (prob(75))
code/modules/research/xenobiology/crossbreeding/stabilized.dm
+1 -1
View File
@@ -158,7 +158,7 @@ Stabilized extracts:
/obj/item/slimecross/stabilized/rainbow/attackby(obj/item/O, mob/user)
var/obj/item/slimecross/regenerative/regen = O
if(istype(O) && !regencore)
if(istype(regen) && !regencore)
to_chat(user, "<span class='notice'>You place the [O] in the [src], prepping the extract for automatic application!</span>")
regencore = regen
regen.forceMove(src)
modular_citadel/code/modules/arousal/arousal.dm
+1 -1
View File
@@ -63,7 +63,7 @@
if(!target || !R)
return
var/turfing = isturf(target)
G.generate_fluid()
G.generate_fluid(R)
if(spill && R.total_volume >= 5)
R.reaction(turfing ? target : target.loc, TOUCH, 1, 0)
if(!turfing)
modular_citadel/code/modules/arousal/genitals.dm
+3 -3
View File
@@ -159,10 +159,10 @@
if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
time_since_last_orgasm++
/obj/item/organ/genital/proc/generate_fluid()
/obj/item/organ/genital/proc/generate_fluid(datum/reagents/R)
var/amount = clamp(fluid_rate * time_since_last_orgasm * fluid_mult,0,fluid_max_volume)
reagents.clear_reagents()
reagents.add_reagent(fluid_id,amount)
R.clear_reagents()
R.add_reagent(fluid_id,amount)
return TRUE
/obj/item/organ/genital/proc/update_link()