Merge pull request #696 from Fox-McCloud/Goon-tweaks

[Goonchem] Tweaks, Fixes, etc.
This commit is contained in:
ZomgPonies
2015-03-28 23:23:47 -04:00
26 changed files with 119 additions and 89 deletions
+1 -1
View File
@@ -485,7 +485,7 @@ REAGENT SCANNER
/obj/item/device/slime_scanner
name = "slime scanner"
icon_state = "adv_spectrometer"
icon_state = "adv_spectrometer_s"
item_state = "analyzer"
origin_tech = "biotech=1"
w_class = 2.0
@@ -74,7 +74,7 @@ effective or pretty fucking useless.
/obj/item/device/rad_laser
name = "Health Analyzer"
icon_state = "health"
icon_state = "health2"
item_state = "healthanalyzer"
icon_override = 'icons/mob/in-hand/tools.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
@@ -110,7 +110,7 @@ effective or pretty fucking useless.
/obj/item/device/rad_laser/proc/handle_cooldown(var/cooldown)
spawn(cooldown)
used = 0
icon_state = "health"
icon_state = "health2"
/obj/item/device/rad_laser/attack_self(mob/user as mob)
..()
@@ -125,7 +125,7 @@
/obj/item/weapon/storage/box/injectors
name = "\improper DNA injectors"
desc = "This box contains injectors it seems."
New()
..()
new /obj/item/weapon/dnainjector/h2m(src)
@@ -148,7 +148,7 @@
new /obj/item/ammo_casing/shotgun(src)
new /obj/item/ammo_casing/shotgun(src)
new /obj/item/ammo_casing/shotgun(src)
new /obj/item/ammo_casing/shotgun(src)
new /obj/item/ammo_casing/shotgun(src)
/obj/item/weapon/storage/box/flashbangs
name = "box of flashbangs (WARNING)"
@@ -355,6 +355,20 @@
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
/obj/item/weapon/storage/box/syndidonkpockets
name = "box of donk-pockets"
desc = "This box feels slightly warm"
icon_state = "donk_kit"
New()
..()
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src)
/obj/item/weapon/storage/box/monkeycubes
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"