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

Adds Blueprints to Overmap Sites #18991

Merged
merged 13 commits into from
Jun 3, 2024
1 change: 1 addition & 0 deletions code/modules/mining/mine_turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var/list/mineral_can_smooth_with = list(

// canSmoothWith is set in Initialize().
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
turf_flags = TURF_FLAG_BACKGROUND

initial_gas = null
opacity = TRUE
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/RustingWithYou - shipblueprints.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: RustingWithYou

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds blueprints to most overmap ships, as well as several away sites and ruins."
- qol: "Shuttles will no longer pull mineral turfs with them when taking off."
Original file line number Diff line number Diff line change
Expand Up @@ -1375,10 +1375,11 @@
"eo" = (
/obj/structure/table/standard,
/obj/random/dirt_75,
/obj/item/book/manual/wiki/engineering_construction{
pixel_x = 3;
pixel_y = 6
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/obj/item/blueprints,
/turf/simulated/floor/tiled,
/area/abandoned_industrial_station/engineering)
"ep" = (
Expand Down
5 changes: 5 additions & 0 deletions maps/away/away_site/orion/orion_automated_station.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,11 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/obj/item/blueprints,
/turf/simulated/floor/tiled/dark,
/area/orion_automated_station/engineering)
"Di" = (
Expand Down
1 change: 1 addition & 0 deletions maps/away/away_site/sensor_relay/sensor_relay.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,7 @@
/obj/random/junk,
/obj/structure/extinguisher_cabinet/west,
/obj/item/stack/cable_coil/yellow,
/obj/item/blueprints,
/turf/simulated/floor/tiled/dark/full,
/area/sensor_relay/maintenance)
"awM" = (
Expand Down
9 changes: 9 additions & 0 deletions maps/away/away_site/tajara/mining_jack/mining_jack.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,15 @@
/obj/machinery/power/apc/east{
req_access = list(202)
},
/obj/item/blueprints,
/obj/structure/table/steel,
/obj/item/blueprints/outpost{
pixel_y = 6
},
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/turf/simulated/floor/plating{
temperature = 278.15
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10573,8 +10573,13 @@
},
/area/peoples_station/atmos)
"Sw" = (
/obj/machinery/pipedispenser/disposal,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/obj/item/blueprints,
/obj/structure/table/standard,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
Expand Down
28 changes: 27 additions & 1 deletion maps/away/away_site/tajara/scrapper/scrapper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2810,6 +2810,12 @@
/area/shuttle/scrapper_ship/bridge)
"HP" = (
/obj/machinery/firealarm/west,
/obj/structure/table/standard,
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/obj/item/blueprints/shuttle,
/turf/simulated/floor/plating{
temperature = 278.15
},
Expand Down Expand Up @@ -3816,6 +3822,26 @@
temperature = 278
},
/area/scrapper_base/atmos)
"TI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/item/blueprints,
/obj/structure/table/standard,
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/turf/simulated/floor/tiled/dark,
/area/scrapper_base/atmos)
"TL" = (
/obj/structure/cable/green{
d1 = 1;
Expand Down Expand Up @@ -37846,7 +37872,7 @@ kz
RN
fn
pl
sE
TI
kz
Uk
OZ
Expand Down
17 changes: 15 additions & 2 deletions maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,11 @@
},
/turf/simulated/floor/reinforced,
/area/tcaf_corvette/engineering)
"gl" = (
/obj/structure/closet/radiation,
/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/engineering)
"gm" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/condiment/shaker/peppermill{
Expand Down Expand Up @@ -2050,10 +2055,15 @@
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/messhall)
"qt" = (
/obj/structure/closet/radiation,
/obj/machinery/light{
dir = 4
},
/obj/effect/floor_decal/industrial/outline/engineering,
/obj/structure/table/reinforced/steel,
/obj/item/blueprints,
/obj/item/pen/drafting/blue{
pixel_y = 5
},
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/engineering)
"qu" = (
Expand Down Expand Up @@ -2210,6 +2220,7 @@
/area/tcaf_corvette/grauwolf)
"sb" = (
/obj/machinery/vending/tool,
/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/engineering)
"sd" = (
Expand Down Expand Up @@ -4662,6 +4673,7 @@
/obj/machinery/light{
dir = 1
},
/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/engineering)
"MS" = (
Expand Down Expand Up @@ -5926,6 +5938,7 @@
/obj/item/stack/material/tritium/full,
/obj/item/stack/material/tritium/full,
/obj/item/stack/material/tritium/full,
/obj/effect/floor_decal/industrial/outline/engineering,
/turf/simulated/floor/tiled/dark,
/area/tcaf_corvette/engineering)
"Xi" = (
Expand Down Expand Up @@ -31583,7 +31596,7 @@ Jm
wq
Xh
Gm
Sd
gl
RA
Yg
wx
Expand Down
13 changes: 11 additions & 2 deletions maps/away/ships/casino/casino.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4667,6 +4667,15 @@
"ns" = (
/turf/simulated/floor/reinforced/airless,
/area/casino/casino_bow)
"nt" = (
/obj/structure/table/reinforced/steel,
/obj/item/blueprints,
/obj/item/pen/drafting/blue{
pixel_x = -6;
pixel_y = 8
},
/turf/simulated/floor/plating,
/area/casino/casino_crew_atmos)
"ob" = (
/obj/structure/casino/roulette_chart,
/obj/random/coin,
Expand Down Expand Up @@ -4838,7 +4847,7 @@
"td" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/atmospherics/portables_connector{
dir = 4;
dir = 4
},
/turf/simulated/floor/plating,
/area/casino/casino_crew_atmos)
Expand Down Expand Up @@ -10013,7 +10022,7 @@ kv
kv
jN
le
jN
nt
kg
mm
mH
Expand Down
12 changes: 4 additions & 8 deletions maps/away/ships/coc/coc_ranger/coc_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3839,17 +3839,13 @@
/area/ship/ranger_corvette/gunnery)
"pFY" = (
/obj/structure/table/steel,
/obj/item/book/manual/wiki/engineering_construction{
desc = "Blueprints for a Xansan-class vessel.";
icon = 'icons/obj/items.dmi';
icon_state = "blueprints";
item_icons = null;
item_state = null;
name = "ship blueprints"
},
/obj/structure/cable/green{
icon_state = "1-8"
},
/obj/item/pen/drafting/blue{
pixel_y = 5
},
/obj/item/blueprints,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/engine2)
"pHP" = (
Expand Down
1 change: 1 addition & 0 deletions maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,7 @@
/obj/item/clothing/gloves/yellow,
/obj/item/ladder_mobile,
/obj/item/hoist_kit,
/obj/item/blueprints,
/turf/simulated/floor/carpet/rubber,
/area/ship/coc_scarab/engistorage)
"fz" = (
Expand Down
17 changes: 8 additions & 9 deletions maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1903,18 +1903,11 @@
dir = 4
},
/obj/structure/table/steel,
/obj/item/book/manual/wiki/engineering_construction{
desc = "Blueprints for a vessel.";
icon = 'icons/obj/items.dmi';
icon_state = "blueprints";
item_icons = null;
item_state = null;
name = "ship blueprints"
},
/obj/item/pen/drafting/blue{
pixel_y = 5
},
/obj/machinery/light,
/obj/item/blueprints,
/turf/simulated/floor/tiled,
/area/coc_survey_ship/atmos)
"ra" = (
Expand Down Expand Up @@ -5624,6 +5617,12 @@
"UF" = (
/turf/simulated/wall,
/area/coc_survey_ship/anomaly)
"UH" = (
/obj/structure/table/steel,
/obj/item/device/hand_labeler,
/obj/item/blueprints/outpost,
/turf/simulated/floor/tiled,
/area/coc_survey_ship/miningeva)
"UI" = (
/obj/effect/floor_decal/corner_wide/yellow{
dir = 10
Expand Down Expand Up @@ -11983,7 +11982,7 @@ Fb
MH
MH
bM
TF
UH
vs
MH
Lr
Expand Down
8 changes: 7 additions & 1 deletion maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5480,6 +5480,12 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/gadpathur_patrol/galley)
"Rj" = (
/obj/structure/table/reinforced/steel,
/obj/item/blueprints,
/obj/item/pen/drafting,
/turf/simulated/floor,
/area/ship/gadpathur_patrol/engineering)
"Rn" = (
/obj/effect/floor_decal/corner_wide/white/diagonal,
/obj/machinery/light/floor{
Expand Down Expand Up @@ -35059,7 +35065,7 @@ LJ
Zs
Mz
rY
Wl
Rj
Zs
Zs
Zs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4535,6 +4535,8 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline/emergency_closet,
/obj/item/pen/drafting,
/obj/item/blueprints,
/turf/simulated/floor/tiled/dark,
/area/ship/dominian_corvette/engineering)
"pJj" = (
Expand Down
Loading
Loading