Adds container types INJECTABLE and DRAWABLE

This commit is contained in:
CitadelStationBot
2017-06-27 08:19:49 -05:00
parent 56f9c0f82a
commit 6a38955803
10 changed files with 68 additions and 59 deletions
+13
View File
@@ -185,6 +185,19 @@
/atom/proc/is_transparent()
return container_type & TRANSPARENT
/atom/proc/is_injectable(allowmobs = TRUE)
if(isliving(src) && allowmobs)
var/mob/living/L = src
return L.can_inject()
if(container_type & OPENCONTAINER)
return TRUE
return container_type & INJECTABLE
/atom/proc/is_drawable(allowmobs = TRUE)
if(is_injectable(allowmobs)) //Everything that can be injected can also be drawn from, but not vice versa
return TRUE
return container_type & DRAWABLE
/atom/proc/allow_drop()
return 1
@@ -102,6 +102,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
container_type = INJECTABLE
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
var/lit = FALSE