Merge pull request #423 from caelaislinn/master

added a couple of new clothing items, updated some sprites
This commit is contained in:
Albert Iordache
2012-02-16 08:29:15 -08:00
25 changed files with 164 additions and 16 deletions

View File

@@ -56,6 +56,22 @@
protective_temperature = 1300
darkness_view = -1
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
icon_state = "bigsunglasses"
item_state = "bigsunglasses"
protective_temperature = 1400
//ultimate glasses
/obj/item/clothing/glasses/hud/security/jensenshades
name = "Augmented shades"
desc = "Polarized bioneural eyewear, designed to augment your vision."
icon_state = "jensenshades"
item_state = "jensenshades"
protective_temperature = 1500
vision_flags = SEE_MOBS
invisa_view = 2
/obj/item/clothing/glasses/sunglasses/sechud
name = "HUDSunglasses"
desc = "Sunglasses with a HUD."

View File

@@ -39,11 +39,15 @@
/obj/structure/ore_box
icon = 'mining.dmi'
icon_state = "orebox"
icon_state = "orebox0"
name = "Ore Box"
desc = "It's heavy"
density = 1
New()
if(prob(50))
icon_state = "orebox1"
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/ore))
src.contents += W;

View File

@@ -74,7 +74,7 @@
else
usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
else if (src.blood_DNA.len)
usr << "\red [src.name] has[src.blood_DNA.len ? " bloody " : " "] hands!"
usr << "\red [src.name] has bloody hands!"
if (src.back)
usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."

View File

@@ -111,6 +111,8 @@
src << "\blue Your icons have been generated!"
..()
known_languages = new/list()
known_languages.Add("english")
// organStructure = new /obj/effect/organstructure/human(src)

View File

@@ -85,4 +85,6 @@
return 1
if (istype(other, /mob/living/carbon/metroid))
return 1
if (istype(other, /mob/living/carbon/human/tajaran))
return 1
return ..()