Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2

This commit is contained in:
izac112
2024-12-04 15:21:21 +01:00
51 changed files with 1908 additions and 258 deletions
+6
View File
@@ -609,6 +609,12 @@
forceMove(get_turf(src))
log_and_message_admins("[key_name(src)] used the OOC escape button to get out of a microwave.")
else if(istype(loc, /obj/structure/gargoyle) && loc:was_rayed)
var/obj/structure/gargoyle/G = loc
G.can_revert = TRUE
qdel(G)
log_and_message_admins("[key_name(src)] used the OOC escape button to revert back from being petrified.")
//You are in food and for some reason can't resist out
else if(istype(loc, /obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/F = src.loc