Merge pull request #5788 from Markolie/randomfixes

Fixes
This commit is contained in:
Fox McCloud
2016-11-13 19:26:02 -05:00
committed by GitHub
6 changed files with 28 additions and 9 deletions
+4
View File
@@ -288,6 +288,10 @@
if((O in user) && is_type_in_list(O,own_blacklist))
continue
if(is_type_in_list(O,types_allowed))
if(isanimal(O))
var/mob/living/simple_animal/SA = O
if(!SA.gold_core_spawnable)
continue
possible_targets += O
targets += input("Choose the target of your hunger.", "Targeting") as null|anything in possible_targets
+6 -2
View File
@@ -454,8 +454,10 @@
set name = "Eject Sleeper"
set category = "Object"
set src in oview(1)
if(usr.stat != 0)
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
src.icon_state = "[base_icon]-open"
src.go_out()
add_fingerprint(usr)
@@ -465,8 +467,10 @@
set name = "Remove Beaker"
set category = "Object"
set src in oview(1)
if(usr.stat != 0)
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
if(beaker)
filtering = 0
beaker.forceMove(usr.loc)
@@ -553,8 +553,8 @@
to_chat(user, "The device is a solid button, there's nothing you can do with it!")
/obj/machinery/readybutton/attack_hand(mob/user as mob)
if(user.stat || stat & (NOPOWER|BROKEN))
to_chat(user, "This device is not powered.")
if(user.stat || stat & (BROKEN))
to_chat(user, "This device is not functioning.")
return
currentarea = get_area(src.loc)
+9 -4
View File
@@ -446,16 +446,17 @@
set name = "Eject occupant"
set category = "Object"
set src in oview(1)
if(usr == occupant)//If the user is inside the tube...
if(usr.stat == 2)//and he's not dead....
if(usr.stat == DEAD)
return
to_chat(usr, "\blue Release sequence activated. This will take two minutes.")
to_chat(usr, "<span class='notice'>Release sequence activated. This will take two minutes.</span>")
sleep(600)
if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already
return
go_out()//and release him from the eternal prison.
else
if(usr.stat != 0)
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
go_out()
add_fingerprint(usr)
@@ -465,14 +466,18 @@
set name = "Move Inside"
set category = "Object"
set src in oview(1)
for(var/mob/living/carbon/slime/M in range(1,usr))
if(M.Victim == usr)
to_chat(usr, "You're too busy getting your life sucked out of you.")
return
if(usr.stat != CONSCIOUS || stat & (NOPOWER|BROKEN))
if(stat & (NOPOWER|BROKEN))
return
if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
return
put_mob(usr)
return
@@ -254,6 +254,7 @@
src.overrides = null
P.emag_overrides = src.emag_overrides
src.emag_overrides = null
default_deconstruction_crowbar(I, 1)
return
else
..(I,user)
+6 -1
View File
@@ -380,10 +380,12 @@
//--FalseIncarnate
/obj/machinery/portable_atmospherics/hydroponics/verb/remove_label()
set name = "Remove Label"
set category = "Object"
set src in view(1)
if(usr.incapacitated())
return
if(labelled)
to_chat(usr, "You remove the label.")
@@ -397,6 +399,9 @@
set name = "Set Light"
set category = "Object"
set src in view(1)
if(usr.incapacitated())
return
var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10)
if(new_light)