cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean them up

Browse Source
This commit is contained in:
Kashargul
2025-01-06 02:29:25 +01:00
parent dce9c09694
commit b26f91600b
30 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+9 -9
View File
@@ -196,23 +196,23 @@
qdel(src)
/mob/living/simple_mob/slime/xenobio/dark_purple/ex_act(severity)
log_and_message_admins("[src] ignited due to a chain reaction with an explosion.")
log_and_message_admins("ignited due to a chain reaction with an explosion.", src)
ignite()
/mob/living/simple_mob/slime/xenobio/dark_purple/fire_act(datum/gas_mixture/air, temperature, volume)
log_and_message_admins("[src] ignited due to exposure to fire.")
log_and_message_admins("ignited due to exposure to fire.", src)
ignite()
/mob/living/simple_mob/slime/xenobio/dark_purple/bullet_act(var/obj/item/projectile/P, var/def_zone)
if(P.damage_type && P.damage_type == BURN && P.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
log_and_message_admins("[src] ignited due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].")
log_and_message_admins("ignited due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].", src)
ignite()
else
..()
/mob/living/simple_mob/slime/xenobio/dark_purple/attackby(var/obj/item/W, var/mob/user)
if(istype(W) && W.force && W.damtype == BURN)
log_and_message_admins("[src] ignited due to being hit with a burning weapon ([W]) by [key_name(user)].")
log_and_message_admins("ignited due to being hit with a burning weapon ([W]) by [key_name(user)].", src)
ignite()
else
..()
@@ -654,29 +654,29 @@
say(pick("Sacrifice...!", "Sssss...", "Boom...!"))
set_AI_busy(TRUE)
sleep(2 SECONDS)
log_and_message_admins("[src] has suicide-bombed themselves while trying to kill \the [L].")
log_and_message_admins("has suicide-bombed themselves while trying to kill \the [L].", src)
explode()
return ..()
/mob/living/simple_mob/slime/xenobio/oil/ex_act(severity)
log_and_message_admins("[src] exploded due to a chain reaction with another explosion.")
log_and_message_admins("exploded due to a chain reaction with another explosion.", src)
explode()
/mob/living/simple_mob/slime/xenobio/oil/fire_act(datum/gas_mixture/air, temperature, volume)
log_and_message_admins("[src] exploded due to exposure to fire.")
log_and_message_admins("exploded due to exposure to fire.", src)
explode()
/mob/living/simple_mob/slime/xenobio/oil/bullet_act(obj/item/projectile/P, def_zone)
if(P.damage_type && P.damage_type == BURN && P.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
log_and_message_admins("[src] exploded due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].")
log_and_message_admins("exploded due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].", src)
explode()
else
..()
/mob/living/simple_mob/slime/xenobio/oil/attackby(obj/item/W, mob/living/user)
if(istype(W) && W.force && W.damtype == BURN)
log_and_message_admins("[src] exploded due to being hit with a burning weapon ([W]) by [key_name(user)].")
log_and_message_admins("exploded due to being hit with a burning weapon ([W]) by [key_name(user)].", src)
explode()
else
..()
code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
+3 -3
View File
@@ -142,7 +142,7 @@
pred_body.ooc_notes = pred_ooc_notes
pred_body.ooc_notes_likes = pred_ooc_likes
pred_body.ooc_notes_dislikes = pred_ooc_dislikes
log_and_message_admins("[pred_body] is now controlled by [pred_body.ckey]. They were restored to control through prey domination, and had been controlled by [prey_ckey].")
log_and_message_admins("is now controlled by [pred_body.ckey]. They were restored to control through prey domination, and had been controlled by [prey_ckey].", pred_body)
pred_body.absorb_langs()
pred_body.prey_controlled = FALSE
qdel(src)
@@ -266,7 +266,7 @@
pred_brain.real_name = pred.real_name
pred.ckey = pred_brain.prey_ckey
pred.prey_controlled = TRUE
log_and_message_admins("[pred] is now controlled by [pred.ckey], they were taken over via prey domination, and were originally controlled by [pred_brain.pred_ckey].")
log_and_message_admins("is now controlled by [pred.ckey], they were taken over via prey domination, and were originally controlled by [pred_brain.pred_ckey].", pred)
if(delete_source)
qdel(prey)
@@ -496,6 +496,6 @@
pred_brain.real_name = pred.real_name
pred.ckey = pred_brain.prey_ckey
pred.prey_controlled = TRUE
log_and_message_admins("[pred] is now controlled by [pred.ckey], they were taken over via pred submission, and were originally controlled by [pred_brain.pred_ckey].")
log_and_message_admins("is now controlled by [pred.ckey], they were taken over via pred submission, and were originally controlled by [pred_brain.pred_ckey].", pred)
if(delete_source)
qdel(prey)
code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+3 -3
View File
@@ -295,7 +295,7 @@
L.pulledby.stop_pulling()
stop_pulling()
original_ckey = ckey
log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(L)] as a morph at [get_area(src)] - [COORD(src)].")
log_and_message_admins("has swapped bodies with [key_name_admin(L)] as a morph at [get_area(src)] - [COORD(src)].", src)
new /mob/living/simple_mob/vore/morph/dominated_prey(L.vore_selected, L.ckey, src, L)
else
to_chat(src, span_warning("\The [L] declined your request for control."))
@@ -362,13 +362,13 @@
parent_morph.forceMove(get_turf(src))
parent_morph.ckey = parent_morph.original_ckey
prey_body.ckey = prey_ckey
log_and_message_admins("[key_name_admin(prey_body)] used the OOC escape button to get out of [key_name_admin(parent_morph)]. They have been returned to their original bodies. [ADMIN_FLW(src)]")
log_and_message_admins("used the OOC escape button to get out of [key_name_admin(parent_morph)]. They have been returned to their original bodies. [ADMIN_FLW(src)]", prey_body)
else
parent_morph.forceMove(get_turf(prey_body))
parent_morph.ckey = parent_morph.original_ckey
prey_body.ckey = prey_ckey
prey_body.forceMove(parent_morph.vore_selected)
log_and_message_admins("[key_name_admin(prey_body)] and [key_name_admin(parent_morph)] have been returned to their original bodies. [get_area(src)] - [COORD(src)].")
log_and_message_admins("and [key_name_admin(parent_morph)] have been returned to their original bodies. [get_area(src)] - [COORD(src)].", prey_body)
qdel(src)
#undef MORPH_COOLDOWN