Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings

This commit is contained in:
ZomgPonies
2013-09-08 11:39:33 -04:00
parent ea91047ce2
commit a935863200
70 changed files with 1084 additions and 923 deletions
+2 -2
View File
@@ -549,12 +549,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER))
return
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("RESEARCH",src,user:wear_suit)
return
*/
user.set_machine(src)
var/dat = ""
files.RefreshResearch()
@@ -81,10 +81,6 @@ proc/move_research_shuttle()
usr.machine = src
src.add_fingerprint(usr)
if(href_list["move"])
//if(ticker.mode.name == "blob")
// if(ticker.mode:declared)
// usr << "Under directive 7-10, [station_name()] is quarantined until further notice."
// return
if (!research_shuttle_moving)
usr << "\blue Shuttle recieved message and will be sent shortly."
+2
View File
@@ -154,9 +154,11 @@
return
if (shocked)
shock(user,50)
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("RESEARCH",src,user:wear_suit)
*/
return