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

[MIRROR] Mop do_after multi use

Browse Source 
(#11633)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-14 00:42:34 -07:00
committed by GitHub
parent 4f4098122b
commit 980ece6324
32 changed files with 216 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modular_chomp/code/game/objects/structures/desert_planet_structures.dm
View File

@@ -25,11 +25,11 @@
name = "sandy pebble"
density = FALSE
/obj/structure/prop/desert_rock/pebble/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
/obj/structure/prop/desert_rock/pebble/Crossed(atom/movable/source)
if(source.is_incorporeal())
return
if(istype(AM, /mob/living))
var/mob/living/M = AM
if(istype(source, /mob/living))
var/mob/living/M = source
if(M.m_intent == I_RUN && prob(5))
M.Weaken(2)
to_chat(M, "You trip over the [src]!")

9
modular_chomp/code/game/turfs/simulated/shuttlewalls.dm
View File

@@ -90,12 +90,15 @@
take_damage(damage)
return
/turf/simulated/shuttlewalls/hitby(AM as mob|obj, var/speed=THROWFORCE_SPEED_DIVISOR)
/turf/simulated/shuttlewalls/hitby(atom/movable/source, var/speed=THROWFORCE_SPEED_DIVISOR)
..()
if(ismob(AM))
if(ismob(source))
return
var/tforce = AM:throwforce * (speed/THROWFORCE_SPEED_DIVISOR)
var/tforce = 0
if(isitem(source))
var/obj/item/O = source
tforce = O.throwforce * (speed/THROWFORCE_SPEED_DIVISOR)
if (tforce < 15)
return

4
modular_chomp/code/modules/lore_codex/cooking_codex.dm
View File

@@ -91,10 +91,10 @@
if(LAZYLEN(R.items))
var/i = 0
for(var/atom/movable/AM as anything in R.items) // Atom typepath
for(var/atom/movable/source in R.items) // Atom typepath
if(i)
text += ", "
text += "[capitalize(initial(AM.name))]"
text += "[capitalize(initial(source.name))]"
i++
D.data += span_bold("Material Objects") + ": [text ? text : "none"]<br>"
text = ""

8
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
View File

@@ -334,11 +334,11 @@ ANT STRUCTURES
name = "spore trap"
var/modifiertype = /datum/modifier/berserk
/obj/effect/ant_structure/trap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
/obj/effect/ant_structure/trap/Crossed(atom/movable/source)
if(source.is_incorporeal())
return
if(anchored && isliving(AM))
var/mob/living/L = AM
if(anchored && isliving(source))
var/mob/living/L = source
if(L == /mob/living/simple_mob/animal/tyr/mineral_ants)
return
else if(L.m_intent == I_RUN)

6
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm
View File

@@ -544,10 +544,10 @@
var/health = 5
var/modifiertype = /datum/modifier/poisoned/weak
/obj/effect/slimeattack/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal())
/obj/effect/slimeattack/Crossed(atom/movable/source)
if(source.is_incorporeal())
return
Bumped(AM)
Bumped(source)
/obj/effect/slimeattack/attackby(var/obj/item/W, var/mob/user)
user.setClickCooldown(user.get_attack_speed(W))