TG: Extra functionality for pill containers. They work like ore satchels now; click

a tile full of pills to scoop them up.

Sec officers start with maintenance access now. GASP!

Properly fixed shutters/blast doors not reacting to buttons, while not
destroying my optimization.
Revision: r3377
Author: 	 vageyenaman
This commit is contained in:
Ren Erthilo
2012-05-01 03:05:10 +01:00
parent 93403a15e5
commit 10d4ca7dd6
4 changed files with 34 additions and 6 deletions
+2 -2
View File
@@ -148,7 +148,7 @@
if(req in I.access) //has an access from the single access list
return 1
for(var/req in src.req_access)
if(!(req in I.access)) //doesn't have this access
if(!(req in I.access)) //doesn't have this access - Leave like this DMTG
return 0
return 1
@@ -164,7 +164,7 @@
if(req in L) //has an access from the single access list
return 1
for(var/req in src.req_access)
if(!(req in L)) //doesn't have this access
if(!(req in L)) //doesn't have this access - Leave like this DMTG
return 0
return 1
+3 -3
View File
@@ -71,7 +71,7 @@
else
for(var/obj/machinery/door/poddoor/M in machines)
for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id)
if (M.density)
spawn( 0 )
@@ -119,7 +119,7 @@
active = 1
icon_state = "launcheract"
for(var/obj/machinery/door/poddoor/M in machines)
for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id)
spawn( 0 )
M.open()
@@ -133,7 +133,7 @@
sleep(50)
for(var/obj/machinery/door/poddoor/M in machines)
for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id)
spawn( 0 )
M.close()
+12
View File
@@ -390,6 +390,18 @@
return
return ///////////////////////////////////////////////////////Alright, that should do it. *MARKER* for any possible runtimes
/obj/item/weapon/storage/pill_bottle/verb/toggle_mode()
set name = "Switch Pill Bottle Method"
set category = "Object"
mode = !mode
switch (mode)
if(1)
usr << "The pill bottle now picks up all pills in a tile at once."
if(0)
usr << "The pill bottle now picks up one pill at a time."
/obj/item/weapon/storage/pillbottlebox/New()
new /obj/item/weapon/storage/pill_bottle( src )
new /obj/item/weapon/storage/pill_bottle( src )
+17 -1
View File
@@ -1768,7 +1768,23 @@
icon_state = "pill[rand(1,20)]"
attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/storage/pill_bottle))
var/obj/item/weapon/storage/pill_bottle/P = W
if (P.mode == 1)
for (var/obj/item/weapon/reagent_containers/pill/O in locate(src.x,src.y,src.z))
if(P.contents.len < P.storage_slots)
O.loc = P
P.orient2hud(user)
else
user << "\blue The pill bottle is full."
return
user << "\blue You pick up all the pills."
else
if (P.contents.len < P.storage_slots)
loc = P
P.orient2hud(user)
else
user << "\blue The pill bottle is full."
return
attack_self(mob/user as mob)
return