Skip to content

Commit

Permalink
Respect spaceDMM linter rules
Browse files Browse the repository at this point in the history
  • Loading branch information
m-dzianishchyts committed Dec 25, 2024
1 parent bcced0a commit b7f06ce
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 35 deletions.
23 changes: 17 additions & 6 deletions modular_ss220/maps220/code/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,17 @@
L.reagents.add_reagent(poison_type, poison_per_bite)
return .

/obj/effect/landmark/awaymissions/Initialize(mapload)
. = ..()
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)

/obj/effect/landmark/awaymissions/proc/on_atom_entered(datum/source, atom/movable/entered)
SIGNAL_HANDLER
return

/* Jungle Mob Spawners */
/obj/effect/landmark/awaymissions/gate_lizard/mine_spawner
icon = 'icons/obj/restraints.dmi'
Expand All @@ -440,10 +451,10 @@
var/id = null
var/jungle_mob = null

/obj/effect/landmark/awaymissions/gate_lizard/mine_spawner/Crossed(AM as mob|obj, oldloc)
if(!isliving(AM))
/obj/effect/landmark/awaymissions/gate_lizard/mine_spawner/on_atom_entered(datum/source, atom/movable/entered)
if(!isliving(source))
return
var/mob/living/M = AM
var/mob/living/M = source
if(faction && (faction in M.faction))
return
triggerlandmark(M)
Expand Down Expand Up @@ -1285,10 +1296,10 @@
var/id = null
var/syndi_mob = null

/obj/effect/landmark/awaymissions/spacebattle/mine_spawner/Crossed(AM as mob|obj, oldloc)
if(!isliving(AM))
/obj/effect/landmark/awaymissions/spacebattle/mine_spawner/on_atom_entered(datum/source, atom/movable/entered)
if(!isliving(source))
return
var/mob/living/M = AM
var/mob/living/M = source
if(faction && (faction in M.faction))
return
triggerlandmark(M)
Expand Down
41 changes: 26 additions & 15 deletions modular_ss220/mobs/code/simple_animal/friendly/frog.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,27 @@
var/squeak_sound = list ('modular_ss220/mobs/sound/creatures/frog_scream1.ogg','modular_ss220/mobs/sound/creatures/frog_scream2.ogg')
gold_core_spawnable = NO_SPAWN


/mob/living/simple_animal/frog/Initialize(mapload)
. = ..()
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)

// Frog procs
/mob/living/simple_animal/frog/attack_hand(mob/living/carbon/human/M as mob)
if(M.a_intent == INTENT_HELP)
get_scooped(M)
..()

/mob/living/simple_animal/frog/Crossed(AM as mob|obj, oldloc)
if(ishuman(AM))
if(!stat)
var/mob/M = AM
to_chat(M, span_notice("[bicon(src)] квакнул!"))
..()
/mob/living/simple_animal/frog/proc/on_atom_entered(datum/source, atom/movable/entered)
SIGNAL_HANDLER
if(!ishuman(source))
return
if(stat)
return
to_chat(source, span_notice("[bicon(src)] квакнул!"))

// Toxic frog procs
/mob/living/simple_animal/frog/toxic/attack_hand(mob/living/carbon/human/H as mob)
Expand All @@ -85,16 +94,18 @@
..()
..()

/mob/living/simple_animal/frog/toxic/Crossed(AM as mob|obj, oldloc)
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(!istype(H.shoes, /obj/item/clothing/shoes))
for(var/obj/item/organ/external/F in H.bodyparts)
if(!F.is_robotic())
if((F.body_part == FOOT_LEFT) || (F.body_part == FOOT_RIGHT))
toxin_affect(H)
to_chat(H, span_warning("Ваши ступни начинают чесаться!"))
/mob/living/simple_animal/frog/toxic/on_atom_entered(datum/source, atom/movable/entered)
..()
if(!ishuman(source))
return
var/mob/living/carbon/human/H = source
if(istype(H.shoes, /obj/item/clothing/shoes))
return
for(var/obj/item/organ/external/F in H.bodyparts)
if(F.is_robotic() || (F.body_part != FOOT_LEFT && !F.body_part == FOOT_RIGHT))
continue
toxin_affect(H)
to_chat(H, span_warning("Ваши ступни начинают чесаться!"))

/mob/living/simple_animal/frog/toxic/proc/toxin_affect(mob/living/carbon/human/M as mob)
if(M.reagents && !toxin_per_touch == 0)
Expand Down
22 changes: 14 additions & 8 deletions modular_ss220/mobs/code/simple_animal/friendly/hamster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
can_collar = 0
holder_type = /obj/item/holder/hamster


/mob/living/simple_animal/mouse/hamster/baby/Initialize(mapload)
. = ..()
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)

// Hamster procs
#define MAX_HAMSTER 20
GLOBAL_VAR_INIT(hamster_count, 0)
Expand Down Expand Up @@ -86,11 +94,9 @@ GLOBAL_VAR_INIT(hamster_count, 0)
mind.transfer_to(A)
qdel(src)

/mob/living/simple_animal/mouse/hamster/baby/Crossed(AM as mob|obj, oldloc)
if(ishuman(AM))
if(!stat)
var/mob/M = AM
to_chat(M, span_notice("[bicon(src)] раздавлен!"))
death()
splat(user = AM)
..()
/mob/living/simple_animal/mouse/hamster/baby/on_atom_entered(datum/source, atom/movable/entered)
if(!ishuman(source) || stat)
return ..()
to_chat(source, span_notice("[bicon(src)] раздавлен!"))
death()
splat(user = source)
17 changes: 11 additions & 6 deletions modular_ss220/mobs/code/simple_animal/hostile/syndi_rat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
/mob/living/simple_animal/hostile/retaliate/syndirat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak, list('sound/creatures/mousesqueak.ogg' = 1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_atom_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)

/mob/living/simple_animal/hostile/retaliate/syndirat/handle_automated_action()
if(prob(chew_probability) && isturf(loc))
Expand Down Expand Up @@ -85,12 +89,13 @@
else if(prob(0.5))
on_lying_down()

/mob/living/simple_animal/hostile/retaliate/syndirat/Crossed(AM as mob|obj, oldloc)
if(ishuman(AM))
if(!stat)
var/mob/M = AM
to_chat(M, span_notice("[bicon(src)] Squeek!"))
..()
/mob/living/simple_animal/hostile/retaliate/syndirat/proc/on_atom_entered(datum/source, atom/movable/entered)
SIGNAL_HANDLER
if(!ishuman(source))
return
if(stat)
return
to_chat(source, span_notice("[bicon(src)] Squeek!"))

/mob/living/simple_animal/hostile/retaliate/syndirat/emote(emote_key, type_override = 1, message, intentional, force_silence)
if(stat != CONSCIOUS)
Expand Down

0 comments on commit b7f06ce

Please sign in to comment.