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.

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

add: Ss1984update v3 #48

Open
wants to merge 29 commits into
base: nova
Choose a base branch
from
Open

add: Ss1984update v3 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
954e823
add: skyrat 1984 update compact
Arceniu Dec 5, 2024
9959b89
add: tgstation.dme update
Arceniu Dec 5, 2024
37e62a0
bugfix: offs changed sound file dislocation
Arceniu Dec 5, 2024
4ea9307
bugfix: computer
Arceniu Dec 5, 2024
5481822
fix: vendor rename update
Arceniu Dec 5, 2024
98b3d97
bugfix: cmg cant change to no burst mode
Arceniu Dec 7, 2024
90c5652
fix cmg sprite
Arceniu Dec 7, 2024
88a9125
qol: bs hellfire spawns with mindshield pin
Arceniu Dec 7, 2024
95a48f7
add: microfusion
Arceniu Dec 19, 2024
39b050b
fix:
Arceniu Dec 19, 2024
f016948
fix: hud.dmm
Arceniu Dec 21, 2024
a41b92f
fix: interdyne have basic syndicate hud
Arceniu Dec 21, 2024
980076b
qol: offs change armor strange
Arceniu Dec 23, 2024
deb3b89
qol: spacehelm reverse
Arceniu Jan 18, 2025
166e08e
qol: shuttle terminal on ds2 work
Arceniu Jan 20, 2025
589bd90
add: oldstation hud
Arceniu Feb 2, 2025
50242bf
add: Oldstation upd (#2)
Arceniu Feb 2, 2025
3a2c3c0
Update _defines.dm
Arceniu Feb 2, 2025
6bd3899
Update _defines.dm
Arceniu Feb 2, 2025
f75db4c
Update oldstation.dm
Arceniu Feb 2, 2025
cfa3e8d
Update oldstation.dm
Arceniu Feb 2, 2025
3d0ec7b
Update _defines.dm
Arceniu Feb 2, 2025
b777a2f
Update _defines.dm
Arceniu Feb 2, 2025
816345c
Update oldstation.dmm
Arceniu Feb 2, 2025
5896b61
Update oldstation.dm
Arceniu Feb 2, 2025
154b33f
fix: mcr misc
Arceniu Feb 17, 2025
5bf113b
fix: akm fix
Arceniu Mar 4, 2025
a60f5ad
add: cargo change
Arceniu Mar 4, 2025
800344a
fix: script update
Arceniu Mar 4, 2025
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
133 changes: 117 additions & 16 deletions _maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions _maps/RandomRuins/SpaceRuins/nova/des_two.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7438,15 +7438,9 @@
"Ht" = (
/obj/effect/turf_decal/trimline/dark_red/line,
/obj/effect/turf_decal/trimline/dark_red/mid_joiner,
/obj/machinery/computer/shuttle{
desc = "A shuttle terminal which allows a connection to the DS-2 forward base's supply shuttle.";
icon_keyboard = "syndie_key";
icon_screen = "syndishuttle";
light_color = "#FA8282";
/obj/machinery/computer/shuttle/interdyne_cargo{
name = "syndicate cargo shuttle terminal";
possible_destinations = "IP-DS-2";
req_access = list("syndicate");
shuttleId = "syndie_cargo"
desc = "A shuttle terminal which allows a connection to the DS-2 forward base's supply shuttle."
},
/turf/open/floor/iron/dark/textured_large,
/area/ruin/space/has_grav/nova/des_two/bridge)
Expand Down
111 changes: 84 additions & 27 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,11 @@
"cY" = (
/obj/effect/decal/cleanable/robot_debris,
/obj/structure/alien/weeds,
/obj/structure/closet/crate/secure/centcom{
name = "secure centcom crate(ECC board)";
req_one_access = list("command","away_engineering")
},
/obj/item/circuitboard/computer/communications/old,
/turf/open/floor/iron/dark,
/area/ruin/space/ancientstation/delta/ai)
"cZ" = (
Expand Down Expand Up @@ -1327,7 +1332,7 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/hall)
"fK" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/airlock/security/old/glass,
/obj/machinery/door/poddoor{
id = "ancient"
},
Expand Down Expand Up @@ -1463,6 +1468,8 @@
/obj/structure/alien/weeds,
/obj/effect/gibspawner/human,
/obj/machinery/light/small/broken/directional/west,
/obj/item/paper/paperslip/corporate/fluff/safe_code/charlie_safe,
/obj/effect/decal/remains/human,
/turf/open/floor/iron/dark,
/area/ruin/space/ancientstation/delta/ai)
"gz" = (
Expand Down Expand Up @@ -1741,10 +1748,10 @@
/area/ruin/space/ancientstation/charlie/hall)
"hV" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/machinery/computer/broken,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"hY" = (
Expand Down Expand Up @@ -2169,6 +2176,9 @@
/obj/machinery/light/small/directional/east,
/obj/item/paper/fluff/ruins/oldstation,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/broken/cryo{
dir = 4
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"jE" = (
Expand Down Expand Up @@ -2470,7 +2480,7 @@
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldsci,
/obj/structure/showcase/machinery/oldpod,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
Expand Down Expand Up @@ -2521,7 +2531,7 @@
/area/ruin/space/ancientstation/charlie/hall)
"kZ" = (
/obj/structure/table/reinforced,
/obj/item/healthanalyzer{
/obj/item/healthanalyzer/advanced{
desc = "A prototype hand-held body scanner able to distinguish vital signs of the subject.";
name = "prototype health analyzer"
},
Expand Down Expand Up @@ -3100,6 +3110,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/bin,
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"ny" = (
Expand Down Expand Up @@ -3622,6 +3634,10 @@
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
"qw" = (
/obj/structure/closet/secure_closet/old_med,
/turf/template_noop,
/area/template_noop)
"qx" = (
/obj/machinery/door/airlock/external/glass/ruin,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
Expand Down Expand Up @@ -3911,13 +3927,13 @@
/area/ruin/space/ancientstation/delta/hall)
"sM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/computer/broken/comlog{
dir = 1
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/sec)
"sP" = (
Expand Down Expand Up @@ -4061,11 +4077,11 @@
/area/ruin/space/ancientstation/charlie/kitchen)
"ua" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
/obj/machinery/computer/broken,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/sec)
"uj" = (
Expand Down Expand Up @@ -4190,8 +4206,8 @@
"uS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/bin,
/obj/effect/spawner/random/trash/garbage,
/obj/structure/closet,
/obj/item/storage/backpack/medic,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"uT" = (
Expand Down Expand Up @@ -4435,7 +4451,7 @@
/area/ruin/space/ancientstation/delta/hall)
"wt" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old{
/obj/machinery/computer/broken/sec{
dir = 1
},
/turf/open/floor/iron/white/textured,
Expand Down Expand Up @@ -4479,13 +4495,13 @@
/area/ruin/space/ancientstation/beta/supermatter)
"wJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/light/directional/west,
/obj/machinery/computer/broken/atm{
dir = 4
},
/turf/open/floor/iron,
/area/ruin/space/ancientstation/beta/atmos)
"wK" = (
Expand Down Expand Up @@ -5315,6 +5331,15 @@
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/diagonal,
/area/ruin/space/ancientstation/beta/gravity)
"CS" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/safe/floor/charlie_captain,
/obj/item/card/id/away/old/captains_spare,
/obj/item/clothing/suit/space/nasavoid/captain,
/obj/item/clothing/head/helmet/space/nasavoid/captain,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"CU" = (
/obj/machinery/air_sensor/oxygen_tank{
chamber_id = "beta-o2"
Expand Down Expand Up @@ -5913,7 +5938,9 @@
/area/ruin/space/ancientstation/charlie/hall)
"Hr" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/card/id/away/old/robo,
/obj/item/card/id/away/old/robo{
name = "ID"
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating{
initial_gas_mix = "co2=6;o2=16;n2=82;TEMP=293.15"
Expand Down Expand Up @@ -6450,10 +6477,10 @@
/area/ruin/space/ancientstation/beta/atmos)
"Kk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old{
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/broken/acc{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_machine,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
Expand Down Expand Up @@ -6500,6 +6527,14 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
"KG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
/obj/machinery/computer/broken/acc,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"KH" = (
/obj/structure/lattice,
/turf/template_noop,
Expand Down Expand Up @@ -7295,7 +7330,7 @@
/turf/open/floor/iron,
/area/ruin/space/ancientstation/delta/hall)
"PC" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/door/airlock/security/old/glass,
/obj/machinery/door/poddoor{
id = "ancient"
},
Expand All @@ -7308,8 +7343,8 @@
/area/ruin/space/ancientstation/charlie/sec)
"PD" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/broken/comlog,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"PG" = (
Expand All @@ -7320,7 +7355,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/machinery/computer/old{
/obj/machinery/computer/broken/eng{
dir = 4
},
/turf/open/floor/iron,
Expand Down Expand Up @@ -7892,6 +7927,18 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/delta/hall)
"TX" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldmed,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/dorms)
"TZ" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/cup/bottle/copper{
Expand Down Expand Up @@ -8416,10 +8463,10 @@
/area/ruin/space/ancientstation/beta/gravity)
"XX" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
/obj/machinery/computer/broken/acc,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/sec)
"XY" = (
Expand Down Expand Up @@ -8544,14 +8591,24 @@
},
/obj/structure/cable,
/obj/structure/broken_flooring/pile/directional/north,
/obj/effect/decal/remains/human{
pixel_y = 5;
pixel_x = -3
},
/obj/item/tank/internals/emergency_oxygen/empty,
/obj/item/clothing/suit/space/damaged_captain,
/obj/item/clothing/head/helmet/space/damaged_captain{
pixel_y = 6;
pixel_x = -5
},
/turf/open/floor/plating,
/area/ruin/space/ancientstation/charlie/hall)
"YF" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
},
/obj/machinery/computer/broken,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"YH" = (
Expand Down Expand Up @@ -8632,9 +8689,9 @@
/area/ruin/space/ancientstation/charlie/hall)
"Zb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/old,
/obj/item/paper/fluff/ruins/oldstation/damagereport,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/broken/com,
/turf/open/floor/iron,
/area/ruin/space/ancientstation/charlie/bridge)
"Ze" = (
Expand Down Expand Up @@ -9915,7 +9972,7 @@ aa
aa
aa
aa
aa
qw
aa
aa
aa
Expand Down Expand Up @@ -12770,7 +12827,7 @@ Qg
Fv
kr
bN
ln
TX
bN
kp
pk
Expand Down Expand Up @@ -12808,7 +12865,7 @@ aS
AA
ax
aW
aI
CS
aQ
bm
qr
Expand Down Expand Up @@ -12873,7 +12930,7 @@ aa
NW
NW
nO
hV
KG
aX
hV
bn
Expand Down
Loading
Loading