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

Merge pull request #11136 from Owai-Seek/broomport-2-17-19

Browse Source 
Ports Broom, Tweak Janitor Vendor
This commit is contained in:
Ghom
2020-02-20 11:48:06 +01:00
committed by GitHub
parent 385cf77c6e ed46d3ca1c
commit 26bbc64f16
9 changed files with 103 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/research/designs/misc_designs.dm
View File

@@ -289,6 +289,16 @@
////////////Janitor Designs//////////////
/////////////////////////////////////////
/datum/design/broom
name = "Broom"
desc = "Just your everyday standard broom."
id = "broom"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 600)
build_path = /obj/item/twohanded/broom
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/mop
name = "Mop"
desc = "Just your everyday standard mop."

2
code/modules/research/techweb/all_nodes.dm
View File

@@ -602,7 +602,7 @@
display_name = "Basic Tools"
description = "Basic mechanical, electronic, surgical and botanical tools."
prereq_ids = list("base")
design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop")
design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
export_price = 5000

15
code/modules/vending/wardrobes.dm
View File

@@ -266,16 +266,17 @@
/obj/item/cartridge/janitor = 3,
/obj/item/clothing/gloves/color/black = 2,
/obj/item/clothing/head/soft/purple = 2,
/obj/item/twohanded/broom = 2,
/obj/item/paint/paint_remover = 2,
/obj/item/melee/flyswatter = 1,
/obj/item/melee/flyswatter = 2,
/obj/item/flashlight = 2,
/obj/item/caution = 8,
/obj/item/holosign_creator = 1,
/obj/item/lightreplacer = 1,
/obj/item/soap = 1,
/obj/item/storage/bag/trash = 1,
/obj/item/clothing/shoes/galoshes = 1,
/obj/item/watertank/janitor = 1,
/obj/item/holosign_creator = 2,
/obj/item/lightreplacer = 2,
/obj/item/soap = 2,
/obj/item/storage/bag/trash = 2,
/obj/item/clothing/shoes/galoshes = 2,
/obj/item/watertank/janitor = 2,
/obj/item/storage/belt/janitor = 2,
/obj/item/screwdriver = 2,
/obj/item/stack/cable_coil/random = 4)