diff --git a/code/WorkInProgress/recycling/conveyor.dm b/code/WorkInProgress/recycling/conveyor.dm
index 58b3c50d966..1dfabc7b29e 100644
--- a/code/WorkInProgress/recycling/conveyor.dm
+++ b/code/WorkInProgress/recycling/conveyor.dm
@@ -127,6 +127,10 @@
else
src.visible_message("\blue [M] had been cut free from the conveyor by [user].")
return
+
+ if(isrobot(user))
+ return
+
// otherwise drop and place on conveyor
user.drop_item()
if(I && I.loc) I.loc = src.loc
diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm
index c9622e07840..c891428e6cb 100644
--- a/code/WorkInProgress/recycling/disposal.dm
+++ b/code/WorkInProgress/recycling/disposal.dm
@@ -68,6 +68,9 @@
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
del(G)
+ if(isrobot(user))
+ return
+
else
user.drop_item()
diff --git a/code/defines/global.dm b/code/defines/global.dm
index 33258062da6..ead79fdde70 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -95,7 +95,7 @@ var
list/prisonwarp = list() //prisoners go to these
list/holdingfacility = list() //captured people go here
list/xeno_spawn = list()//Aliens spawn at these.
- list/mazewarp = list()
+// list/mazewarp = list()
list/tdome1 = list()
list/tdome2 = list()
list/tdomeobserve = list()
diff --git a/code/game/landmarks.dm b/code/game/landmarks.dm
index 9c66d24bf40..de376a82157 100644
--- a/code/game/landmarks.dm
+++ b/code/game/landmarks.dm
@@ -36,8 +36,8 @@
if (name == "prisonwarp")
prisonwarp += loc
del(src)
- if (name == "mazewarp")
- mazewarp += loc
+// if (name == "mazewarp")
+// mazewarp += loc
if (name == "Holding Facility")
holdingfacility += loc
if (name == "tdome1")
diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index 841555b3831..77e66074c93 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -176,11 +176,10 @@
src.anchored = !( src.anchored )
playsound(src.loc, 'Screwdriver.ogg', 75, 1)
user << (src.anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")
- else if(istype(W, /obj/item/weapon/crowbar) && reinf)
- if(state <=1)
- state = 1-state;
- playsound(src.loc, 'Crowbar.ogg', 75, 1)
- user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
+ else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <=1)
+ state = 1-state;
+ playsound(src.loc, 'Crowbar.ogg', 75, 1)
+ user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
else
var/aforce = W.force
if(reinf) aforce /= 2.0
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 9d576ec5b9a..89684bc2d47 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -519,6 +519,7 @@
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
+/*
if (href_list["sendtomaze"])
if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
var/mob/M = locate(href_list["sendtomaze"])
@@ -550,6 +551,7 @@
else
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
return
+*/
if (href_list["tdome1"])
if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
@@ -1714,7 +1716,7 @@
foo += text("Thunderdome Admin | ")
foo += text("Thunderdome Observer | ")
foo += text("Prison | ")
- foo += text("Maze | ")
+ // foo += text("Maze | ")
foo += text("Heal/Revive | ")
else
foo += text("Hasn't Entered Game | ")