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

Found the "the floor" message admin!

Browse Source
This commit is contained in:
Thalpy
2019-06-26 19:40:46 +01:00
parent afe43070a0
commit a2a5bbdb11
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
-3
View File
@@ -316,14 +316,11 @@
var/pseudo_death = FALSE var/pseudo_death = FALSE
/mob/living/simple_animal/pet/cat/custom_cat/death() /mob/living/simple_animal/pet/cat/custom_cat/death()
message_admins("dedcat")
if (pseudo_death == TRUE) //secret cat chem if (pseudo_death == TRUE) //secret cat chem
icon_state = "custom_cat_dead" icon_state = "custom_cat_dead"
Stun(1000) Stun(1000)
canmove = 0 canmove = 0
message_admins("dedcat")
friendly = "deads at" friendly = "deads at"
return return
else else
message_admins("deddercat")
..() ..()
code/modules/surgery/organs/organ_internal.dm
-1
View File
@@ -22,7 +22,6 @@
if(replaced) if(replaced)
replaced.Remove(M, special = 1) replaced.Remove(M, special = 1)
if(drop_if_replaced) if(drop_if_replaced)
message_admins("[get_turf(M)]")
replaced.forceMove(get_turf(M)) replaced.forceMove(get_turf(M))
else else
qdel(replaced) qdel(replaced)
code/modules/surgery/organs/vocal_cords.dm
+2 -2
View File
@@ -1187,7 +1187,7 @@
if(2 to INFINITY) if(2 to INFINITY)
L.lay_down() L.lay_down()
E.cooldown += 10 E.cooldown += 10
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(L.lewd?"<span class='love'>You eagerly lie down!":"<span class='notice'>You suddenly lie down!'")]</b></span>"), 5) addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(L.lewd?"<span class='love'>You eagerly lie down!":"<span class='notice'>You suddenly lie down!")]</b></span>"), 5)
//KNOCKDOWN //KNOCKDOWN
else if(findtext(message, knockdown_words)) else if(findtext(message, knockdown_words))
@@ -1198,7 +1198,7 @@
if(2 to INFINITY) if(2 to INFINITY)
L.Knockdown(30 * power_multiplier * E.phase) L.Knockdown(30 * power_multiplier * E.phase)
E.cooldown += 8 E.cooldown += 8
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "<span class='notice'>You suddenly drop to the ground!'</b></span>"), 5) addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "<span class='notice'>You suddenly drop to the ground!</b></span>"), 5)
//tier3 //tier3
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+1
View File
@@ -35,6 +35,7 @@
message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot].") message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot].")
log_game("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot].")
var/datum/reagents/R = new/datum/reagents(3000)//Hey, just in case. var/datum/reagents/R = new/datum/reagents(3000)//Hey, just in case.
var/datum/effect_system/smoke_spread/chem/s = new() var/datum/effect_system/smoke_spread/chem/s = new()
R.my_atom = my_atom //Give the gas a fingerprint R.my_atom = my_atom //Give the gas a fingerprint