diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index 21d14921f66..69dc941d9ee 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -202,11 +202,6 @@ path = /obj/item/storage/bag/stockparts_box category = "Engineering" -/datum/autolathe/recipe/rfd_ammo - name = "compressed matter cartridge" - path = /obj/item/rfd_ammo - category = "Engineering" - /datum/autolathe/recipe/scalpel name = "scalpel" path = /obj/item/surgery/scalpel @@ -516,12 +511,6 @@ hidden = 1 category = "Arms and Ammunition" -/datum/autolathe/recipe/rfd_construction - name = "rapid-fabrication-device c-class" - path = /obj/item/rfd/construction - hidden = 1 - category = "Engineering" - /datum/autolathe/recipe/electropack name = "electropack" path = /obj/item/device/radio/electropack @@ -544,4 +533,10 @@ name = "handcuffs" path = /obj/item/handcuffs hidden = 1 + category = "General" + +/datum/autolathe/recipe/brassknuckles + name = "brass knuckles" + path = /obj/item/clothing/gloves/brassknuckles + hidden = 1 category = "General" \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 960542cccb6..1f41933ca3b 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -318,7 +318,6 @@ name = "enhanced force gloves" amplification = 2.5 //because *2.5 is kind of scary okay. sometimes you want the scary effect. sometimes not. - /obj/item/clothing/gloves/brassknuckles name = "brass knuckles" desc = "A pair of brass knuckles. Generally used to enhance the user's punches." @@ -330,6 +329,8 @@ force = 5 punch_force = 5 clipped = 1 + matter = list(DEFAULT_WALL_MATERIAL = 1000) + drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = /decl/sound_category/sword_pickup_sound diff --git a/code/modules/research/designs/protolathe/mining_designs.dm b/code/modules/research/designs/protolathe/mining_designs.dm index 8b689018c06..0efd2f3e864 100644 --- a/code/modules/research/designs/protolathe/mining_designs.dm +++ b/code/modules/research/designs/protolathe/mining_designs.dm @@ -26,6 +26,11 @@ materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 1000, MATERIAL_DIAMOND = 2000) build_path = /obj/item/pickaxe/diamonddrill +/datum/design/item/mining/kinetic_analyzer + req_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) + materials = list(DEFAULT_WALL_MATERIAL = 4000) + build_path = /obj/item/device/kinetic_analyzer + //Frames /datum/design/item/mining/ka_frame01 req_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) diff --git a/code/modules/research/designs/protolathe/tool_designs.dm b/code/modules/research/designs/protolathe/tool_designs.dm index c19cf609f0d..0e2a6e78f08 100644 --- a/code/modules/research/designs/protolathe/tool_designs.dm +++ b/code/modules/research/designs/protolathe/tool_designs.dm @@ -107,4 +107,34 @@ datum/design/item/tool/advanced_light_replacer desc = "Allows for the construction of an intelliCard." req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) materials = list(MATERIAL_GLASS = 1000, MATERIAL_GOLD = 200) - build_path = /obj/item/aicard \ No newline at end of file + build_path = /obj/item/aicard + +/datum/design/item/tool/hand_tele + desc = "A hand-held bluespace teleporter that can rip open portals to a random nearby location, or lock onto a teleporter with a selected teleportation beacon." + req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) + materials = list(MATERIAL_STEEL = 5000, MATERIAL_GLASS = 5000, MATERIAL_GOLD = 5000, MATERIAL_DIAMOND = 2500, MATERIAL_URANIUM = 2500, MATERIAL_PHORON = 2500) + build_path = /obj/item/hand_tele + +/datum/design/item/tool/rfd + desc = "A RFD, modified to construct walls and floors." + req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 2500, MATERIAL_SILVER = 2500, MATERIAL_GOLD = 2500) + build_path = /obj/item/rfd/construction + +/datum/design/item/tool/rfd_ammo + desc = "Highly compressed matter for the RFD." + req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000) + build_path = /obj/item/rfd_ammo + +/datum/design/item/tool/rfd_service + desc = "A RFD, modified to deploy service items." + req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4) + materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000) + build_path = /obj/item/rfd/service + +/datum/design/item/tool/rfd_pipe + desc = "A heavily modified RFD, modified to construct pipes and piping accessories." + req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5) + materials = list(DEFAULT_WALL_MATERIAL = 3000, MATERIAL_GLASS = 2500, MATERIAL_SILVER = 2500) + build_path = /obj/item/rfd/piping \ No newline at end of file diff --git a/code/modules/research/designs/protolathe/weapon_designs.dm b/code/modules/research/designs/protolathe/weapon_designs.dm index 4d82cf10131..588fb36a7fe 100644 --- a/code/modules/research/designs/protolathe/weapon_designs.dm +++ b/code/modules/research/designs/protolathe/weapon_designs.dm @@ -61,4 +61,10 @@ /datum/design/item/weapon/gun/beegun req_tech = list(TECH_MATERIAL = 6, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 6, TECH_MAGNET = 4) materials = list(DEFAULT_WALL_MATERIAL = 2000, MATERIAL_GLASS = 2000, MATERIAL_SILVER = 500, MATERIAL_DIAMOND = 3000) - build_path = /obj/item/gun/energy/beegun \ No newline at end of file + build_path = /obj/item/gun/energy/beegun + +/datum/design/item/weapon/gravity_gun //Hello, Gordon! + desc = "This nifty gun disables the gravity in the area you shoot at. Use with caution." + req_tech = list(TECH_COMBAT = 5, TECH_BLUESPACE = 5) + materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 5000, MATERIAL_SILVER = 3000, MATERIAL_GOLD = 3000, MATERIAL_PHORON = 500) + build_path = /obj/item/gun/energy/gravity_gun \ No newline at end of file diff --git a/html/changelogs/snakebittenn-fuckresearch.yml b/html/changelogs/snakebittenn-fuckresearch.yml new file mode 100644 index 00000000000..37b248ada83 --- /dev/null +++ b/html/changelogs/snakebittenn-fuckresearch.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Snakebittenn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds kinetic analyzers, hand teleporters, gravity guns to the protolathe." + - rscadd: "Adds brass knuckles to the autolathe's hacked section." + - rscdel: "Removes RFDs from the autolathe, look in the protolathe." \ No newline at end of file