Merge pull request #1698 from VOREStation/bored,_fix_polaris

Fixes two high-priority issues
This commit is contained in:
Datraen
2016-05-19 14:29:46 -04:00
12 changed files with 18 additions and 17 deletions

View File

@@ -25,6 +25,8 @@
user << "<span class='warning'>It expired at [worldtime2text(expiration_time)].</span>"
/obj/item/weapon/card/id/guest/read()
if(!Adjacent(usr))
return //Too far to read
if (world.time > expiration_time)
usr << "<span class='notice'>This pass expired at [worldtime2text(expiration_time)].</span>"
else

View File

@@ -232,7 +232,6 @@
/obj/item/weapon/hand_tele,
/obj/item/weapon/card/id/captains_spare,
/obj/item/device/aicard,
/obj/item/device/mmi,
/obj/item/device/paicard,
/obj/item/weapon/gun,
/obj/item/weapon/pinpointer,

View File

@@ -16,6 +16,7 @@
icon_state = "donutbox"
name = "donut box"
var/startswith = 6
max_storage_space = 12
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard