Merge pull request #12924 from Firecage/Optable

Changes the operating table to be an actual table.
This commit is contained in:
phil235
2015-11-11 17:31:38 +01:00
23 changed files with 167 additions and 170 deletions
+1 -1
View File
@@ -169,7 +169,7 @@
if ( \
!isturf(src.loc) || \
!(locate(/obj/structure/table) in src.loc) && \
!(locate(/obj/structure/optable) in src.loc) && \
!(locate(/obj/structure/table/optable) in src.loc) && \
!(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \
)
user << "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray.</span>"
+1 -1
View File
@@ -70,7 +70,7 @@
proc/get_location_modifier(mob/M)
var/turf/T = get_turf(M)
if(locate(/obj/structure/optable, T))
if(locate(/obj/structure/table/optable, T))
return 1
else if(locate(/obj/structure/table, T))
return 0.8