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

New Rock Outpost #3733

Merged
merged 108 commits into from
Mar 1, 2025
Merged
Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
2b94fa6
woah! rock!
kaylexis Nov 11, 2024
817559c
lol fixed typos
kaylexis Nov 11, 2024
3ce6230
small fixes
kaylexis Nov 11, 2024
79f4f4b
removes ruins
kaylexis Nov 11, 2024
a367039
fixes indestructible plastitanium and plastitanium glass not smoothing
kaylexis Nov 11, 2024
2f3cf75
tries fixing ind. plastitanium glass not smoothing, again
kaylexis Nov 11, 2024
c20b78a
minor outpost changes
kaylexis Nov 11, 2024
9cd2297
adds some missing lights
kaylexis Nov 11, 2024
0b7f10c
adds like 3 more missing lights
kaylexis Nov 11, 2024
8bd5c3b
adds some decals to places that pissed me off
kaylexis Nov 11, 2024
d0932ee
conveyor levers, safety signs, and railings
kaylexis Nov 11, 2024
441809a
removes a wrong marker
kaylexis Nov 11, 2024
7bb1ff9
gives larry a name
kaylexis Nov 11, 2024
8d17f1d
adhd details
kaylexis Nov 11, 2024
86aa3c7
removes one useless door marker lol
kaylexis Nov 11, 2024
95a6b2f
how did that sign get there
kaylexis Nov 11, 2024
6cf7267
reconnects disconnected gas pumps
kaylexis Nov 11, 2024
c03ae37
posters and stuffs
kaylexis Nov 11, 2024
54a0dff
fixes issue with disconnected pumps.. again ????
kaylexis Nov 11, 2024
c0bae88
fixes the thing that fucks up the thing
kaylexis Nov 11, 2024
7941544
undoes smoothing shit attempt
kaylexis Nov 11, 2024
274d1e5
forgot holopads lmao
kaylexis Nov 11, 2024
e1bb68b
NGR-ifies and changes a bunch of stuff
kaylexis Nov 13, 2024
b3a1c5f
woahw whaaat
kaylexis Nov 13, 2024
47570fa
fixes indestructible plastit wall and window
kaylexis Nov 13, 2024
d5258bd
updates centcom plastit walls
kaylexis Nov 13, 2024
3411a6e
missed a spot
kaylexis Nov 13, 2024
83f2886
re-adds dirt and grime
kaylexis Nov 13, 2024
9eade24
fixes indentation on window.dm
kaylexis Nov 13, 2024
6dc560d
minor decal and wall machinery changes
kaylexis Nov 14, 2024
ca1f6cb
fixes some layout and engineering things
kaylexis Nov 14, 2024
3b2a25d
shutters and accidental wall fixes
kaylexis Nov 14, 2024
0836ca3
fixes a problem
kaylexis Nov 14, 2024
31aa0f9
vghbn
kaylexis Nov 14, 2024
b2c3f18
co-authors zevo because i forgot
kaylexis Nov 14, 2024
c52fdc5
man fuck these errors
kaylexis Nov 14, 2024
b918c7b
fixes misssing shaft error??
kaylexis Nov 14, 2024
3354e33
man fuck this elevator
kaylexis Nov 14, 2024
cd8ea7d
AUHHHHHHHHHGHHH
kaylexis Nov 14, 2024
be56cec
oups! fixes atmos problem
kaylexis Nov 15, 2024
f12b046
Update ngr_rock.dmm
kaylexis Nov 15, 2024
f0aba2e
removes an elevator landmark that was probably causing the error
kaylexis Nov 15, 2024
99c235d
Update ngr_rock.dmm
kaylexis Nov 15, 2024
a71d475
external access and such funstuff
kaylexis Nov 15, 2024
ed85823
small decal changes
kaylexis Dec 7, 2024
771add1
thats a lot of decals
kaylexis Dec 7, 2024
bea9fb7
WOAH! UP TO SPECS!
kaylexis Dec 12, 2024
15c5f21
underdoor tileswhatevervthefck
kaylexis Dec 12, 2024
830a18f
linter error these nu
kaylexis Dec 12, 2024
b8c01e8
Update ngr_rock.dmm
kaylexis Dec 12, 2024
786ef0c
mm hydrogen
kaylexis Dec 12, 2024
53b15bd
better ngr style
kaylexis Dec 12, 2024
6bb5468
fixes some things i messed up
kaylexis Dec 12, 2024
dbae052
minor area fix
kaylexis Dec 12, 2024
953f5ab
fixes some unconnected atmos devices
kaylexis Dec 13, 2024
31e7794
adds some missing lights
kaylexis Dec 13, 2024
349c844
appeases the mapping gods
kaylexis Dec 14, 2024
543b5a3
i should sleep i think
kaylexis Dec 14, 2024
686deb2
ends my intense agony
kaylexis Dec 15, 2024
5bd72a4
hangar tile fix
kaylexis Dec 15, 2024
5bd2355
adds winter coats for the srothy
kaylexis Dec 15, 2024
fcbed9a
Update icemoon.dm
kaylexis Dec 15, 2024
ac0baa9
somehow fixed the snow problem. what
kaylexis Dec 15, 2024
216d52c
post-testmerge alterations
kaylexis Dec 21, 2024
81332b6
Update ngr_rock.dmm
kaylexis Dec 21, 2024
0df63ba
fixes om5 void tile bug and other changes
kaylexis Dec 21, 2024
2c08b1f
missed a few tiles
kaylexis Dec 21, 2024
567f7c6
cameras
kaylexis Dec 21, 2024
8d2a058
Update ngr_rock.dmm
kaylexis Dec 21, 2024
611d3f7
yeah
kaylexis Dec 21, 2024
8807591
fixes hangar tiles
kaylexis Dec 21, 2024
587a8b9
various changes
kaylexis Dec 22, 2024
0944437
removes duplicate fax
kaylexis Dec 22, 2024
db561b8
replaces APCs
kaylexis Dec 22, 2024
3853221
Update ngr_rock.dmm
kaylexis Dec 22, 2024
9c3af56
removes a duplicate APC woops
kaylexis Dec 22, 2024
916ffea
waow! fixes rockplanet atmos probl,em
kaylexis Dec 29, 2024
78b7c7f
Merge branch 'master' into outpost
kaylexis Jan 13, 2025
88f9e31
Merge branch 'master' into outpost
kaylexis Jan 15, 2025
d01f59d
larger maints + fluff
kaylexis Jan 24, 2025
01b035f
updates outpost command center
kaylexis Jan 24, 2025
7a5590f
Update ngr_rock.dmm
kaylexis Jan 24, 2025
c2b000f
Merge branch 'master' into outpost
kaylexis Jan 24, 2025
a5e9bc9
new steam hazard subtypes + steam hazards in outpost maint
kaylexis Jan 26, 2025
b6eafb9
makes rilena room accessable
kaylexis Jan 26, 2025
7289099
small changes
kaylexis Jan 26, 2025
a349a72
Update ngr_rock.dmm
kaylexis Jan 26, 2025
f78e95a
Merge branch 'master' into outpost
kaylexis Jan 26, 2025
7da471e
fixes fuck
kaylexis Jan 26, 2025
c309e59
Merge branch 'outpost' of https://github.com/kaylexis/Shiptest into o…
kaylexis Jan 26, 2025
5f4b8fa
Update ngr_rock.dmm
kaylexis Jan 26, 2025
8f6ec75
fixes missing walls in admin fax room
kaylexis Jan 27, 2025
fa95a4f
Update ngr_rock.dmm
kaylexis Jan 28, 2025
962f652
Update ngr_rock.dmm
kaylexis Jan 31, 2025
86f1f6b
Update ngr_rock.dmm
kaylexis Feb 1, 2025
5b3fa25
outpost expansion + secondary elevator
kaylexis Feb 18, 2025
2ea4575
Update ngr_rock.dmm
kaylexis Feb 18, 2025
93928a9
Update ngr_rock.dmm
kaylexis Feb 18, 2025
9f49e61
Update elevator_platform.dm
kaylexis Feb 19, 2025
a2086a1
Update elevator_platform.dm
kaylexis Feb 19, 2025
6fcaadc
comments out weird elevator code i did
kaylexis Feb 19, 2025
af8a44a
more maint access + emergency elevator exits
kaylexis Feb 20, 2025
ea9f543
fixes stupid fucking bug DIE
kaylexis Feb 20, 2025
0b2266c
details
kaylexis Feb 21, 2025
b604088
Update ngr_rock.dmm
kaylexis Feb 21, 2025
4a42638
Update ngr_rock.dmm
kaylexis Feb 23, 2025
9a96a0a
Update ngr_rock.dmm
kaylexis Feb 28, 2025
05d7574
hangar changes
kaylexis Mar 1, 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
Prev Previous commit
Next Next commit
removes duplicate fax
kaylexis committed Dec 22, 2024
commit 094443766786fe98b60ba77c21ea3dcdc814f99c
53 changes: 29 additions & 24 deletions _maps/outpost/ngr_rock.dmm
Original file line number Diff line number Diff line change
@@ -1809,14 +1809,10 @@
/turf/open/floor/plasteel/dark,
/area/outpost/vacant_rooms/shop)
"lJ" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/corner/opaque/tan{
dir = 5
},
/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
dir = 1
},
/turf/open/floor/plasteel/tech,
/obj/effect/turf_decal/techfloor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/dark,
/area/outpost/hallway/central)
"lL" = (
/obj/machinery/light/small/directional/east,
@@ -3510,8 +3506,13 @@
pixel_x = 4;
pixel_y = -1
},
/obj/item/stamp/ngr{
pixel_x = -8
/obj/item/stamp{
pixel_y = 6;
pixel_x = -7
},
/obj/item/stamp/denied{
pixel_y = 1;
pixel_x = -7
},
/turf/open/floor/plasteel/dark,
/area/outpost/maintenance/central)
@@ -4187,12 +4188,6 @@
"zV" = (
/turf/closed/indestructible/plastitanium/nodiagnonal,
/area/outpost/vacant_rooms/shop)
"zZ" = (
/obj/effect/turf_decal/techfloor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/dark,
/area/outpost/hallway/central)
"Aa" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating/asteroid/rockplanet/cracked/safe,
@@ -5021,8 +5016,8 @@
"Fz" = (
/obj/structure/table/reinforced,
/obj/machinery/light/small/directional/west,
/obj/machinery/fax/admin/outpost{
pixel_y = 5
/obj/item/clipboard{
pixel_y = 3
},
/turf/open/floor/plasteel/dark,
/area/outpost/maintenance/central)
@@ -5065,11 +5060,13 @@
/turf/open/floor/plating/asteroid/rockplanet/safe,
/area/outpost/maintenance/starboard)
"FN" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/corner/opaque/tan{
dir = 10
dir = 5
},
/obj/effect/turf_decal/trimline/opaque/bar/filled/line{
dir = 1
},
/obj/effect/turf_decal/trimline/opaque/bar/filled/line,
/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel/tech,
/area/outpost/hallway/central)
"FU" = (
@@ -5131,6 +5128,14 @@
/obj/machinery/light/floor,
/turf/open/floor/concrete/slab_1,
/area/outpost/hallway/central)
"Ge" = (
/obj/effect/turf_decal/corner/opaque/tan{
dir = 10
},
/obj/effect/turf_decal/trimline/opaque/bar/filled/line,
/obj/structure/closet/firecloset/wall/directional/south,
/turf/open/floor/plasteel/tech,
/area/outpost/hallway/central)
"Gf" = (
/obj/structure/table/wood/poker,
/obj/item/spacecash/bundle/c10{
@@ -11534,7 +11539,7 @@ mC
yo
to
oR
zZ
lJ
iX
Ex
wG
@@ -12575,9 +12580,9 @@ bc
bc
bc
LU
lJ
EM
FN
EM
Ge
eW
aw
eW

Unchanged files with check annotations Beta

if(!match_message && right_fallback && left_fallback)
fallback_log_message += "\n\t[item_path] has invalid value, using fallback icon.\n\titem_state = \"[item_state]\""
continue
TEST_NOTICE(src, "Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/shrink_ray in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "shrink_ray"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/retro in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "spur"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/captain/brazil in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "caplaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/laser/e10 in both 'icons/obj/guns/manufacturer/eoehoma/lefthand.dmi' & 'icons/obj/guns/manufacturer/eoehoma/righthand.dmi'. item_state = "spur"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/hos/brazil in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "hoslaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/hos/brazil/true in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "hoslaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/turret in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "turretlaser"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/nuclear in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "nucgun"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/e_gun/advtaser/mounted in both 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi' & 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'. item_state = "armcannonstun4"

Check notice on line 83 in code/modules/unit_tests/icons/inhands.dm

GitHub Actions / Integration Tests (BASIC_TESTS) / run_integration_tests

: /datum/unit_test/defined_item_states

Missing inhand sprites for /obj/item/gun/energy/lasercannon in both 'icons/mob/inhands/weapons/guns_lefthand.dmi' & 'icons/mob/inhands/weapons/guns_righthand.dmi'. item_state = "laser"
else if(missing_left)
TEST_FAIL("Missing left inhand sprite for [item_path] in '[lefthand_file]'[left_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
else if(missing_right)