shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into cube-world

Browse Source
This commit is contained in:
TrilbySpaceClone
2020-04-23 02:04:56 -04:00
parent e311aafbc0 af222768fe
commit c8b3032087
374 changed files with 5466 additions and 3233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/misc_designs.dm
+49 -4
View File
@@ -293,20 +293,20 @@
name = "Broom"
desc = "Just your everyday standard broom."
id = "broom"
build_type = PROTOLATHE
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 1000, /datum/material/glass = 600)
build_path = /obj/item/twohanded/broom
category = list("Equipment")
category = list("initial", "Equipment", "Misc")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/mop
name = "Mop"
desc = "Just your everyday standard mop."
id = "mop"
build_type = PROTOLATHE
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 1200, /datum/material/glass = 100)
build_path = /obj/item/mop
category = list("Equipment")
category = list("initial", "Equipment", "Misc")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/advmop
@@ -329,6 +329,16 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/normtrash
name = "Trashbag"
desc = "It's a bag for trash, you put garbage in it."
id = "normtrash"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = 2000)
build_path = /obj/item/storage/bag/trash
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/blutrash
name = "Trashbag of Holding"
desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
@@ -349,6 +359,17 @@
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/paint_remover
name = "Paint Remover"
desc = "Removes stains from the floor, and not much else."
id = "paint_remover"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 1000)
reagents_list = list(/datum/reagent/acetone = 60)
build_path = /obj/item/paint/paint_remover
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/spraybottle
name = "Spray Bottle"
desc = "A spray bottle, with an unscrewable top."
@@ -614,3 +635,27 @@
build_path = /obj/item/circuitboard/computer/sat_control
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
/////////////////////////////////////////
////////////Tackle Gloves////////////////
/////////////////////////////////////////
/datum/design/tackle_dolphin
name = "Dolphin Gloves"
id = "tackle_dolphin"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = 2500)
build_path = /obj/item/clothing/gloves/tackler/dolphin
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/tackle_rocket
name = "Rocket Gloves"
id = "tackle_rocket"
build_type = PROTOLATHE
materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000)
build_path = /obj/item/clothing/gloves/tackler/rocket
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY