Nuke disk fix, preferences fix, bay lore purge and more (#1523)

-may fix #1493
-fix missing the nuke disk being deleted when put inside any container
-fix several references to bay lore, like nyx and etc
-add some missing splint related code
-added fireandglory's hammer weapon to uplink and heist
-tries to unfuck the designs.dm
This commit is contained in:
Alberyk
2017-01-12 23:03:40 +02:00
committed by skull132
parent ea7148443f
commit 858690a62b
13 changed files with 171 additions and 177 deletions
+6 -3
View File
@@ -496,10 +496,12 @@
/obj/item/weapon/melee/chainsword,\
/obj/item/weapon/melee/baton/stunrod,\
/obj/item/weapon/material/harpoon,\
/obj/item/weapon/material/scythe,\
/obj/item/weapon/material/twohanded/spear/plasteel,\
/obj/item/weapon/material/sword/trench,\
/obj/item/weapon/material/sword/rapier)
/obj/item/weapon/material/sword/rapier,\
/obj/item/weapon/melee/hammer,\
/obj/item/weapon/material/twohanded/fireaxe,\
/obj/item/weapon/melee/classic_baton)
/obj/random/coin
name = "random coin"
@@ -535,7 +537,8 @@
/obj/item/weapon/gun/energy/toxgun,\
/obj/item/weapon/gun/energy/vaurca/gatlinglaser,\
/obj/item/weapon/gun/energy/vaurca/blaster,\
/obj/item/weapon/gun/energy/crossbow/largecrossbow)
/obj/item/weapon/gun/energy/crossbow/largecrossbow,\
/obj/item/weapon/gun/energy/rifle/laser/xray)
/obj/random/colored_jumpsuit
name = "random colored jumpsuit"