From eeb0aa4a4ecc5e1ff9cf099c9895faddbf0f75f3 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 7 Jan 2017 19:08:41 -0200 Subject: [PATCH] Fix berets and missing snowflake welding tool (#1435) Fixes #1429 Incorrect Ikrad's hat path And the missing experimental welding tool from rd --- code/modules/clothing/head/jobs.dm | 5 +- code/modules/customitems/item_defines.dm | 8 +-- code/modules/research/designs.dm | 62 +++--------------------- 3 files changed, 13 insertions(+), 62 deletions(-) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index c58ec963c38..a7b3f29d4ff 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -80,19 +80,18 @@ /obj/item/clothing/head/beret/engineering name = "engineering beret" desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety." - icon_state = "beret_engineering" + icon_state = "e_beret_badge" /obj/item/clothing/head/beret/purple name = "purple beret" desc = "A stylish, if purple, beret." - icon_state = "beret_purple" + icon_state = "purpleberet" /obj/item/clothing/head/beret/centcom/officer name = "officers beret" desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces." icon_state = "centcomofficerberet" - /obj/item/clothing/head/beret/centcom/captain name = "captains beret" desc = "A white beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index d2b4a182d11..e20768f30f3 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -847,7 +847,7 @@ All custom items with worn sprites must follow the contained sprite system: http desc = "That's a magnet in the shape of a hair flower pin. Smells nice." -/obj/item/clothing/head/beret/eng/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth +/obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth name = "LR-31MTA Beret" desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \ Along the top half of the ring \"LR-31MTA\" is engraved. The word \"Yam'hir\" is engraved along the bottom half of the ring. \ @@ -859,13 +859,13 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = 1 var/letter -/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/New() +/obj/item/clothing/head/beret/engineering/fluff/ikrad_beret/New() ..() var/obj/item/fluff/ikrad_letter/hat_letter = new(src) letter = hat_letter hat_letter.attack_self() -/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/attack_self(var/mob/user) +/obj/item/clothing/head/beret/engineering/fluff/ikrad_beret/attack_self(var/mob/user) if(letter) user << "You remove \the [letter] from inside the [src]'s flap." user.drop_from_inventory(src) @@ -875,7 +875,7 @@ All custom items with worn sprites must follow the contained sprite system: http else ..() -/obj/item/clothing/head/beret/eng/fluff/ikrad_beret/attackby(var/obj/item/fluff/ikrad_letter/W, var/mob/user) +/obj/item/clothing/head/beret/engineering/fluff/ikrad_beret/attackby(var/obj/item/fluff/ikrad_letter/W, var/mob/user) if(!src.letter && istype(W)) user << "You place \the [W] back inside the [src]'s flap." user.drop_from_inventory(W) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index f7c197207fc..106a5fc6f2f 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1882,58 +1882,10 @@ datum/design/item/advanced_light_replacer materials = list(DEFAULT_WALL_MATERIAL = 500) build_path =/obj/item/device/lightreplacer/advanced -/* Uncomment if someone makes these buildable -/datum/design/rust_core_control - name = "Circuit Design (RUST core controller)" - desc = "Allows for the construction of circuit boards used to build a core control console for the RUST fusion engine." - id = "rust_core_control" - req_tech = list("programming" = 4, TECH_ENGINEERING = 4) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20) - build_path = "/obj/item/weapon/circuitboard/rust_core_control" - -datum/design/rust_fuel_control - name = "Circuit Design (RUST fuel controller)" - desc = "Allows for the construction of circuit boards used to build a fuel injector control console for the RUST fusion engine." - id = "rust_fuel_control" - req_tech = list("programming" = 4, TECH_ENGINEERING = 4) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20) - build_path = "/obj/item/weapon/circuitboard/rust_fuel_control" - -datum/design/rust_fuel_port - name = "Internal circuitry (RUST fuel port)" - desc = "Allows for the construction of circuit boards used to build a fuel injection port for the RUST fusion engine." - id = "rust_fuel_port" - req_tech = list(TECH_ENGINEERING = 4, "materials" = 5) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20, "uranium" = 3000) - build_path = "/obj/item/weapon/module/rust_fuel_port" - -datum/design/rust_fuel_compressor - name = "Circuit Design (RUST fuel compressor)" - desc = "Allows for the construction of circuit boards used to build a fuel compressor of the RUST fusion engine." - id = "rust_fuel_compressor" - req_tech = list("materials" = 6, TECH_PHORON = 4) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "diamond" = 1000) - build_path = "/obj/item/weapon/module/rust_fuel_compressor" - -datum/design/rust_core - name = "Internal circuitry (RUST tokamak core)" - desc = "The circuit board that for a RUST-pattern tokamak fusion core." - id = "pacman" - req_tech = list(bluespace = 3, phorontech = 4, magnets = 5, powerstorage = 6) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "diamond" = 2000) - build_path = "/obj/item/weapon/circuitboard/rust_core" - -datum/design/rust_injector - name = "Internal circuitry (RUST tokamak core)" - desc = "The circuit board that for a RUST-pattern particle accelerator." - id = "pacman" - req_tech = list(powerstorage = 3, engineering = 4, phorontech = 4, materials = 6) - build_type = IMPRINTER - materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "uranium" = 2000) - build_path = "/obj/item/weapon/circuitboard/rust_core" -*/ +datum/design/item/experimental_welder + name = "Experimental Welding Tool" + desc = "A scientifically-enhanced welding tool that uses fuel-producing microbes to gradually replenish its fuel supply" + id = "experimental_welder" + req_tech = list(ENGINEERING = 4, TECH_MATERIAL = 4) + materials = list(DEFAULT_WALL_MATERIAL = 500) + build_path =/obj/item/weapon/weldingtool/experimental