8000 Various fixes by notghosti · Pull Request #4560 · Monkestation/Monkestation2.0 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Various fixes #4560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 17, 2024
Merged

Various fixes #4560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
44a9c5a
#4362 'blueshield' HOS Mantle
notghosti Dec 13, 2024
93b9344
Nerfing multi cell wall charger #3979
notghosti Dec 13, 2024
a903c97
spraypainting sm should work now
ThePooba Dec 13, 2024
2b687c2
Merge branch 'small-fixes' of https://github.com/Gw0sty/Monkestation2…
ThePooba Dec 13, 2024
6e26a84
Adds Bronze to lathes #3702
notghosti Dec 13, 2024
4d9e36c
Merge remote-tracking branch 'upstream/master' into small-fixes
notghosti Dec 13, 2024
9c173af
Merge branch 'small-fixes' of https://github.com/Gw0sty/Monkestation2…
notghosti Dec 13, 2024
73f708a
Adds a singular camera to fix #4505
notghosti Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
2 changes: 2 additions & 0 deletions code/datums/components/supermatter_crystal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10000
1 change: 0 additions & 1 deletion monkestation/code/modules/blueshift/appliances/colony.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion monkestation/code/modules/blueshift/clothing/nova_neck.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
11 changes: 11 additions & 0 deletions monkestation/code/modules/research/designs/autolathe/materials.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7921,6 +7921,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"
Expand Down
Loading
0