Skip to content
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.

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

Some additional even more various fixes #5171

Merged
8 changes: 6 additions & 2 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2259,6 +2259,7 @@
/obj/item/clothing/head/bio_hood/interdyne,
/obj/item/clothing/head/bio_hood/interdyne,
/obj/item/clothing/head/bio_hood/interdyne,
/obj/item/construction/plumbing/research,
/turf/open/floor/iron/white/textured,
/area/ruin/space/has_grav/deepstorage/xenobiology)
"gu" = (
Expand Down Expand Up @@ -2646,6 +2647,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/directional/south,
/obj/machinery/duct,
/turf/open/floor/iron/white/textured,
/area/ruin/space/has_grav/deepstorage/xenobiology)
"kE" = (
Expand Down Expand Up @@ -2795,6 +2797,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/duct,
/turf/open/floor/iron/white/textured,
/area/ruin/space/has_grav/deepstorage/xenobiology)
"sy" = (
Expand Down Expand Up @@ -2908,8 +2911,8 @@
/obj/item/stack/sheet/mineral/plasma/twenty,
/obj/item/stack/sheet/mineral/plasma/twenty,
/obj/item/stack/sheet/mineral/plasma/twenty,
/obj/item/disk/vacuum_upgrade,
/obj/item/disk/vacuum_upgrade,
/obj/item/disk/vacuum_upgrade/biomass,
/obj/item/disk/vacuum_upgrade/biomass,
/turf/open/floor/iron/white/textured,
/area/ruin/space/has_grav/deepstorage/xenobiology)
"wI" = (
Expand Down Expand Up @@ -2988,6 +2991,7 @@
/area/ruin/space/has_grav/deepstorage/xenobiology)
"An" = (
/obj/structure/extinguisher_cabinet/directional/south,
/obj/machinery/duct,
/turf/open/floor/iron/white/textured,
/area/ruin/space/has_grav/deepstorage/xenobiology)
"Az" = (
Expand Down
25 changes: 15 additions & 10 deletions _maps/map_files/Blueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/item/restraints/handcuffs/cable/orange,
/turf/open/floor/iron/dark/side{
dir = 8
},
Expand Down Expand Up @@ -65234,7 +65237,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/structure/table/reinforced,
/obj/machinery/computer/security,
/turf/open/floor/iron/dark/side{
dir = 1
},
Expand Down Expand Up @@ -72741,9 +72744,9 @@
/area/station/maintenance/department/crew_quarters/bar)
"ofN" = (
/obj/machinery/newscaster/directional/west,
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/item/restraints/handcuffs/cable/orange,
/obj/machinery/computer/security{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
"ofS" = (
Expand Down Expand Up @@ -78236,9 +78239,11 @@
/turf/open/floor/iron,
/area/station/security/prison/workout)
"phZ" = (
/obj/structure/filingcabinet,
/obj/effect/turf_decal/bot,
/obj/item/radio/intercom/directional/west,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
"pic" = (
Expand Down Expand Up @@ -85416,7 +85421,9 @@
/area/station/service/forge)
"qCz" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/table/reinforced,
/obj/machinery/computer/security{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/medical)
"qCC" = (
Expand Down Expand Up @@ -95798,14 +95805,14 @@
/turf/open/floor/plating,
/area/station/engineering/atmos/upper)
"sCJ" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/radio,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark/side{
dir = 8
},
Expand Down Expand Up @@ -117184,9 +117191,7 @@
},
/area/station/security/execution/transfer)
"wCw" = (
/obj/machinery/camera/directional/south{
c_tag = "Courtroom - Holding Cell"
},
/obj/machinery/camera/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -117342,7 +117342,7 @@ hNt
xoG
ogZ
fck
qbm
dQL
hNt
xoG
ogZ
Expand Down Expand Up @@ -119398,7 +119398,7 @@ hNt
xoG
ogZ
fck
dQL
qbm
hNt
xoG
ogZ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
dir = 10;
network = list("ss13","engine","engineering")
},
/obj/machinery/incident_display/delam/directional/south,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"fo" = (
Expand Down Expand Up @@ -314,6 +313,7 @@
/obj/machinery/atmospherics/components/binary/pump{
name = "Gas to Chamber"
},
/obj/machinery/incident_display/delam/directional/south,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
"lv" = (
Expand Down
4 changes: 2 additions & 2 deletions code/modules/food_and_drinks/machinery/smartfridge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,8 @@
/obj/machinery/smartfridge/chemistry/virology/preloaded
initial_contents = list(
/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/cup/bottle/cold = 1,
/obj/item/reagent_containers/cup/bottle/flu_virion = 1,
// /obj/item/reagent_containers/cup/bottle/cold = 1,
// /obj/item/reagent_containers/cup/bottle/flu_virion = 1, Monkestation removal, Old viro code
/obj/item/reagent_containers/cup/bottle/mutagen = 1,
/obj/item/reagent_containers/cup/bottle/sugar = 1,
/obj/item/reagent_containers/cup/bottle/plasma = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,8 @@ GLOBAL_LIST_INIT(biomass_unlocks, list())
name = "\"Rockroach\" biomass recycler upgrade disk"
printable_types = list(/mob/living/basic/cockroach/rockroach = 0.4)
vacuum_printable_types = list(/mob/living/basic/cockroach/rockroach = 0.4)

/datum/slime_store_item/rockroach
name = "\"Rockroach\" biomass recycler upgrade disk"
desc = "An upgrade disk for the biomass recycler that allows for the printing of Rockroaches."
item_path = /obj/item/disk/biomass_upgrade/rockroach
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/datum/slime_store_item/random_color_mutator
name = "Random Color Mutation Syringe"
desc = "Adds the No Ooze Slime mutation to a single slime."
desc = "Mutates a single slime into a possible mutation."
item_path = /obj/item/slime_mutation_syringe/random_color
cost = 3000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
/datum/slime_mutation_data/oil,
)

/datum/slime_color/darkpurple/on_first_unlock()
/datum/slime_color/red/on_first_unlock()
GLOB.biomass_unlocks |= list(/mob/living/basic/xenofauna/dron = 1)

/datum/slime_color/yellow
Expand Down
Loading