diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index a5c71bb091..3d0713be74 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -76,6 +76,39 @@ icon_state = "beret" flags = FPRINT | TABLEPASS +/obj/item/clothing/head/chaplain_hood + name = "chaplain's hood" + desc = "It's hood that covers the head. It keeps you warm during the space winters." + icon_state = "chaplain_hood" + flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR + +/obj/item/clothing/head/hasturhood + name = "hastur's hood" + desc = "It's unspeakably stylish" + icon_state = "hasturhood" + flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR + +/obj/item/clothing/head/nursehat + name = "nurse's hat" + desc = "It allows quick identification of trained medical personnel." + icon_state = "nursehat" + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/secsoft + name = "soft cap" + desc = "It's baseball hat in tasteful red colour." + icon_state = "secsoft" + flags = FPRINT|TABLEPASS|HEADCOVERSEYES + item_state = "helmet" + +/obj/item/clothing/head/cargosoft + name = "cargo cap" + desc = "It's a baseball hat in a tasteless yellow colour." + icon_state = "cargosoft" + flags = FPRINT|TABLEPASS|HEADCOVERSEYES + item_state = "helmet" + var/flipped = 0 + // CHUMP HELMETS: COOKING THEM DESTROYS THE CHUMP HELMET SPAWN. @@ -103,21 +136,7 @@ flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR item_state="cueball" flags_inv = 0 - -/obj/item/clothing/head/secsoft - name = "soft cap" - desc = "It's baseball hat in tasteful red colour." - icon_state = "secsoft" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES - item_state = "helmet" - -/obj/item/clothing/head/cargosoft - name = "cargo cap" - desc = "It's a baseball hat in a tasteless yellow colour." - icon_state = "cargosoft" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES - item_state = "helmet" - var/flipped = 0 + armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/syndicatefake name = "red space-helmet replica" @@ -146,8 +165,6 @@ item_state = "thunderdome" armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) - - /obj/item/clothing/head/helmet/welding name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." @@ -197,24 +214,6 @@ armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0) flags_inv = 0 -/obj/item/clothing/head/chaplain_hood - name = "chaplain's hood" - desc = "It's hood that covers the head. It keeps you warm during the space winters." - icon_state = "chaplain_hood" - flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR - -/obj/item/clothing/head/hasturhood - name = "hastur's hood" - desc = "It's unspeakably stylish" - icon_state = "hasturhood" - flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR - -/obj/item/clothing/head/nursehat - name = "nurse's hat" - desc = "It allows quick identification of trained medical personnel." - icon_state = "nursehat" - flags = FPRINT|TABLEPASS - /obj/item/clothing/head/helmet/cardborg name = "cardborg helmet" desc = "A helmet made out of a box." @@ -222,4 +221,5 @@ item_state = "cardborg_h" flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH see_face = 0.0 + armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 8ba5ffc814..33211757e4 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -620,16 +620,16 @@ /obj/item/seeds/harebell name = "pack of harebell seeds" desc = "These seeds grow into pretty little flowers." - icon_state = "seed" + icon_state = "seed-harebell" mypath = "/obj/item/seeds/harebell" species = "harebell" plantname = "Harebells" - productname = "" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/harebell" lifespan = 100 endurance = 20 maturation = 7 production = 1 - yield = -1 + yield = 2 potency = 1 oneharvest = 1 growthstages = 4 @@ -1058,6 +1058,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/poppy seed = "/obj/item/seeds/poppyseed" name = "poppy" + desc = "Long-used as a symbol of rest, peace, and death." icon_state = "poppy" potency = 30 New() @@ -1066,6 +1067,16 @@ reagents.add_reagent("bicaridine", 1+round((potency / 10), 1)) bitesize = 1+round(reagents.total_volume / 3, 1) +/obj/item/weapon/reagent_containers/food/snacks/grown/harebell + seed = "obj/item/seeds/harebellseed" + name = "harebell" + desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten’d not thy breath.\"" + icon_state = "harebell" + potency = 1 + New() + ..() + reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) + bitesize = 1+round(reagents.total_volume / 3, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/potato seed = "/obj/item/seeds/potatoseed" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index f3837b0689..3d27612f95 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -15,14 +15,14 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - - /obj/item/clothing/suit/bluetag name = "blue laser tag armour" desc = "Blue Pride, Station Wide" icon_state = "bluetag" item_state = "bluetag" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list (/obj/item/weapon/gun/energy/laser/bluetag) + /obj/item/clothing/suit/redtag name = "red laser tag armour" @@ -30,6 +30,7 @@ icon_state = "redtag" item_state = "redtag" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list (/obj/item/weapon/gun/energy/laser/redtag) /obj/item/clothing/suit/apron diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index e5a0d764d1..dbbaf9b42d 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -82,6 +82,8 @@ obj/item/weapon/gun/energy/laser/retro icon_state = "bluetag" desc = "Standard issue weapon of the Imperial Guard" projectile_type = "/obj/item/projectile/bluetag" + origin_tech = "combat=1;magnets=2" + var/charge_tick = 0 special_check(var/mob/living/carbon/human/M) if(ishuman(M)) @@ -89,8 +91,6 @@ obj/item/weapon/gun/energy/laser/retro return 1 M << "\red You need to be wearing your laser tag vest!" return 0 - var/charge_tick = 0 - New() ..() @@ -118,6 +118,7 @@ obj/item/weapon/gun/energy/laser/retro icon_state = "redtag" desc = "Standard issue weapon of the Imperial Guard" projectile_type = "/obj/item/projectile/redtag" + origin_tech = "combat=1;magnets=2" var/charge_tick = 0 special_check(var/mob/living/carbon/human/M) diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index cf8e30dcdf..227e534a75 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index f17befa9c2..bef25e9097 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index ec01c97b67..ab4641989a 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index c15c6879fe..3a5e4af9a5 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 26589bcfb8..3deaadf8cb 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ