Merge remote-tracking branch 'citrp/master' into to_chat

This commit is contained in:
kevinz000
2020-04-13 21:57:45 -07:00
307 changed files with 2416 additions and 2810 deletions
+5 -5
View File
@@ -97,7 +97,7 @@
set category = "Fun"
set name = "Make Robot"
if(!ticker)
if(!SSticker)
alert("Wait until the game starts")
return
if(istype(M, /mob/living/carbon/human))
@@ -112,7 +112,7 @@
set category = "Fun"
set name = "Make Simple Animal"
if(!ticker)
if(!SSticker)
alert("Wait until the game starts")
return
@@ -160,7 +160,7 @@
set category = "Fun"
set name = "Make Alien"
if(!ticker)
if(!SSticker)
alert("Wait until the game starts")
return
if(ishuman(M))
@@ -271,7 +271,7 @@
set category = "Admin"
set name = "Grant Full Access"
if (!ticker)
if (!SSticker)
alert("Wait until the game starts")
return
if (istype(M, /mob/living/carbon/human))
@@ -605,7 +605,7 @@
// DNA2 - Admin Hax
/client/proc/cmd_admin_toggle_block(var/mob/M,var/block)
if(!ticker)
if(!SSticker)
alert("Wait until the game starts")
return
if(istype(M, /mob/living/carbon))