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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

Browse Source
This commit is contained in:
Ghommie
2020-04-25 17:09:34 +02:00
parent fecf6cef2f 24971060bd
commit 94f014589d
342 changed files with 5021 additions and 2930 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/biogenerator_designs.dm
+1 -1
View File
@@ -72,7 +72,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube
build_path = /obj/item/reagent_containers/food/snacks/cube/monkey
category = list("initial", "Food")
/datum/design/smeat
code/modules/research/designs/misc_designs.dm
+24
View File
@@ -635,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