diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 580dbe6c6205..75b2cdf82042 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -9306,6 +9306,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/white, /area/station/science/explab) "dtB" = ( diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 9077b361f7b8..51298592d8f9 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -152,6 +152,8 @@ return if(istype(item, /obj/item/melee/roastingstick)) return FALSE + if(istype(item, /obj/item/toy/crayon/spraycan)) + return FALSE if(istype(item, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/cig = item var/clumsy = HAS_TRAIT(user, TRAIT_CLUMSY) diff --git a/monkestation/code/modules/blueshift/appliances/colony.dm b/monkestation/code/modules/blueshift/appliances/colony.dm index 1b3e683f427c..357329310fd1 100644 --- a/monkestation/code/modules/blueshift/appliances/colony.dm +++ b/monkestation/code/modules/blueshift/appliances/colony.dm @@ -477,7 +477,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/space_heater/wall_mounted, 29) base_icon_state = "wall_charger" circuit = null max_batteries = 3 - charge_rate = 900 KW /// The item we turn into when repacked var/repacked_type = /obj/item/wallframe/cell_charger_multi diff --git a/monkestation/code/modules/blueshift/clothing/nova_neck.dm b/monkestation/code/modules/blueshift/clothing/nova_neck.dm index cf85b439c148..fffb5bf08953 100644 --- a/monkestation/code/modules/blueshift/clothing/nova_neck.dm +++ b/monkestation/code/modules/blueshift/clothing/nova_neck.dm @@ -56,8 +56,11 @@ desc = "A plated mantle that one might wrap around the upper torso. The 'scales' of the garment signify the members of security and how you're carrying them on your shoulders." icon = 'monkestation/code/modules/blueshift/icons/mob/clothing/neck.dmi' worn_icon = 'monkestation/code/modules/blueshift/icons/mob/clothing/neck.dmi' - icon_state = "hosmantle_blue" //There's a red version if you remove the _blue, but its not coded in currently. + icon_state = "hosmantle" +/obj/item/clothing/neck/mantle/hosmantle/blue + icon_state = "hosmantle_blue" + /obj/item/clothing/neck/mantle/capmantle name = "\proper the captain's mantle" desc = "A formal mantle to drape around the shoulders. Others stand on the shoulders of giants. You're the giant they stand on." diff --git a/monkestation/code/modules/research/designs/autolathe/materials.dm b/monkestation/code/modules/research/designs/autolathe/materials.dm new file mode 100644 index 000000000000..211d394934f9 --- /dev/null +++ b/monkestation/code/modules/research/designs/autolathe/materials.dm @@ -0,0 +1,11 @@ +/datum/design/bronze + name = "Bronze" + id = "bronze" + build_type = AUTOLATHE + materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT) + build_path = /obj/item/stack/sheet/bronze + category = list( + RND_CATEGORY_INITIAL, + RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS, + ) + maxstack = 50 diff --git a/tgstation.dme b/tgstation.dme index 7518b42b14c8..e6544459a53c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7927,6 +7927,7 @@ #include "monkestation\code\modules\research\designs\multi-department_designs.dm" #include "monkestation\code\modules\research\designs\nanite_designs.dm" #include "monkestation\code\modules\research\designs\security_designs.dm" +#include "monkestation\code\modules\research\designs\autolathe\materials.dm" #include "monkestation\code\modules\research\designs\autolathe\service_designs.dm" #include "monkestation\code\modules\research\nanites\nanite_chamber.dm" #include "monkestation\code\modules\research\nanites\nanite_chamber_computer.dm"