Merge pull request #1220 from Erthilo/master

ERT updates, megaphone, AI holopad fixes, cleanbot limiter
This commit is contained in:
SkyMarshal
2012-06-01 14:55:41 -07:00
18 changed files with 314 additions and 117 deletions
+1 -1
View File
@@ -117,7 +117,7 @@
for(var/i = 1, i <=2, i++)
new /obj/item/weapon/storage/box/ert(src)
new /obj/item/weapon/storage/box/medic(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/healthanalyzer(src)
return
/obj/item/weapon/storage/backpack/security
+7
View File
@@ -2061,6 +2061,13 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove
desc = "An appendix which appears to be inflamed."
icon_state = "appendixinflamed"
/obj/item/weapon/megaphone
name = "megaphone"
desc = "A device used to project your voice. Loudly."
icon = 'items.dmi'
icon_state = "megaphone"
var/cooldown = 0
/obj/item/weapon/flavor
name = "bland flavoring packet"
desc = "A sachet of flavoring, designed to be used with \"LiquidFood\" rations. The flavor is indeterminable."