cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

upstream-merge-16484 [MDB IGNORE] (#9289)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Selis
2024-10-25 21:39:18 +02:00
committed by GitHub
co-authored by Kashargul
parent b32c1ed032
commit 026253a175
277 changed files with 471452 additions and 36179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/gravemarker.dm
+2 -2
View File
@@ -122,7 +122,7 @@
return
if(usr.stat || usr.restrained())
return
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
src.set_dir(turn(src.dir, 270))
@@ -141,7 +141,7 @@
return
if(usr.stat || usr.restrained())
return
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
src.set_dir(turn(src.dir, 90))
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2 -2
View File
@@ -75,7 +75,7 @@
return
if(usr.stat || usr.restrained())
return
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
src.set_dir(turn(src.dir, 270))
@@ -89,7 +89,7 @@
return
if(usr.stat || usr.restrained())
return
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction))) // CHOMPEdit
if(ismouse(usr) || (isobserver(usr) && !CONFIG_GET(flag/ghost_interaction)))
return
src.set_dir(turn(src.dir, 90))
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -84,7 +84,7 @@
return ..()
/obj/structure/trash_pile/attack_ghost(mob/observer/user as mob)
if(CONFIG_GET(flag/disable_player_mice)) // CHOMPEdit
if(CONFIG_GET(flag/disable_player_mice))
to_chat(user, span_warning("Spawning as a mouse is currently disabled."))
return
@@ -116,7 +116,7 @@
host = new /mob/living/simple_mob/animal/passive/mouse(get_turf(src))
if(host)
if(CONFIG_GET(flag/uneducated_mice)) // CHOMPEdit
if(CONFIG_GET(flag/uneducated_mice))
host.universal_understand = 0
announce_ghost_joinleave(src, 0, "They are now a mouse.")
host.ckey = user.ckey