diff --git a/code/WorkInProgress/Chemistry-Holder.dm b/code/WorkInProgress/Chemistry-Holder.dm
index 500a7a2a793..594f5bd0f23 100644
--- a/code/WorkInProgress/Chemistry-Holder.dm
+++ b/code/WorkInProgress/Chemistry-Holder.dm
@@ -218,7 +218,7 @@ datum
update_total()
total_volume = 0
for(var/datum/reagent/R in reagent_list)
- if(R.volume < 1)
+ if(R.volume < 0.1)
del_reagent(R.id)
else
total_volume += R.volume
diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm
index 54801511be4..9d2daa7c208 100644
--- a/code/game/gamemodes/sandbox/sandbox.dm
+++ b/code/game/gamemodes/sandbox/sandbox.dm
@@ -18,5 +18,5 @@
/datum/game_mode/sandbox/check_finished()
return 0
-/datum/game_mode/extended/can_start()
+/datum/game_mode/sandbox/can_start()
return 1
\ No newline at end of file
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5839df7e98b..e01c978b199 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1545,6 +1545,8 @@ var/showadminmessages = 1
usr << browse(dat, "window=adminplayeropts;size=480x150")
/obj/admins/proc/player()
+ if (!usr.client.holder)
+ return
var/dat = "Player Menu"
dat += "| Name | Real Name | Key | Options | PM | Traitor? | Karma |
|---|
"
//add IP: | to this if wanting to add back in IP checking
@@ -1587,7 +1589,7 @@ var/showadminmessages = 1
"}
switch(is_special_character(M))
if(0)
- dat += {"]Traitor? | "}
+ dat += {"Traitor? | "}
if(1)
dat += {"Traitor? | "}
if(2)
@@ -1632,7 +1634,7 @@ var/showadminmessages = 1
"}
switch(is_special_character(M))
if(0)
- dat += {"]Traitor? | "}
+ dat += {"Traitor? | "}
if(1)
dat += {"Traitor? | "}
if(2)
@@ -1709,6 +1711,8 @@ var/showadminmessages = 1
usr << browse(dat, "window=ban;size=300x400")
*/
/obj/admins/proc/Secrets()
+ if (!usr.client.holder)
+ return
var/lvl = 0
switch(src.rank)
@@ -1840,6 +1844,8 @@ var/showadminmessages = 1
set category = "Server"
set name = "Start Vote"
set desc="Starts vote"
+ if (!usr.client.holder)
+ return
var/confirm = alert("What vote would you like to start?", "Vote", "Restart", "Change Game Mode", "Cancel")
if(confirm == "Cancel")
return
@@ -1923,6 +1929,8 @@ var/showadminmessages = 1
set category = "Server"
set name = "Restart"
set desc="Restarts the world"
+ if (!usr.client.holder)
+ return
var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel")
if(confirm == "Cancel")
return
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index c42c434abd9..cdf9f229328 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -998,7 +998,7 @@
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
- reagent.add_reagent("nutriment", 15)
+ reagents.add_reagent("nutriment", 15)
bitesize = 2
else
reagents.add_reagent("nutriment", 10)