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

Survey scanner #2103

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from 64 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
b89674c
me saving my changes
Erikafox May 21, 2023
80e52ef
me saving my changes x2
Erikafox May 24, 2023
2d72cdf
zoinkles scoob
Erikafox May 26, 2023
f907b31
Update gear_packs.dm
Erikafox May 27, 2023
e80dd22
Update all_nodes.dm
Erikafox May 27, 2023
f67627b
Update gear_packs.dm
Erikafox May 28, 2023
d217959
a
Erikafox May 28, 2023
8730a5c
Update gear_packs.dm
Erikafox May 28, 2023
ee57c18
orugh
Erikafox Jun 25, 2023
073329f
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Jun 26, 2023
e472306
doink
Erikafox Jun 26, 2023
2a89de0
upgrades
Erikafox Jun 26, 2023
d450861
Update exploration.dm
Erikafox Jun 27, 2023
178be1d
does this fix?
Erikafox Jun 27, 2023
759c0b5
Update all_nodes.dm
Erikafox Jun 27, 2023
d91627a
Update survery_handheld.dm
Erikafox Jun 27, 2023
e13d1de
Update survey_points.dm
Erikafox Jun 27, 2023
602e7c7
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Jul 5, 2023
7627eef
buh
Erikafox Jul 6, 2023
59210a3
we ball
Erikafox Jul 15, 2023
38165b8
Update _anomalies.dm
Erikafox Jul 15, 2023
0f13e87
tm fixes
Erikafox Jul 15, 2023
bff240c
doubles every instance of feature spawn chance.
Erikafox Jul 15, 2023
a979ae9
Update survey_points.dm
Erikafox Jul 15, 2023
549ea12
ownzones dissections
Erikafox Jul 15, 2023
47b6c5c
Update survey_points.dm
Erikafox Jul 15, 2023
1398e60
balls
Erikafox Jul 15, 2023
5bcccf7
yea
Erikafox Jul 15, 2023
c423f69
beach adjustment
Erikafox Jul 16, 2023
9d60b0f
more balance
Erikafox Jul 16, 2023
cfeb74b
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Jul 17, 2023
a39c14b
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Jul 24, 2023
46f6e25
balance
Erikafox Jul 26, 2023
561b106
God this is fucked don't tm this commit
Erikafox Jul 29, 2023
31d4d60
Revert "God this is fucked don't tm this commit"
Erikafox Jul 29, 2023
fc6921b
fuck
Erikafox Jul 29, 2023
066bc14
Merge branch 'master' into pr/2103
Erikafox Sep 6, 2023
553d230
Merge branch 'master' into pr/2103
Erikafox Nov 8, 2023
4fc64b0
yup thisll work
Erikafox Nov 8, 2023
abdc0b5
Update BeachGenerator.dm
Erikafox Nov 8, 2023
6ee00ff
Update BeachGenerator.dm
Erikafox Nov 8, 2023
a5a4e0a
g
Erikafox Nov 8, 2023
47c5cff
commit
Erikafox Nov 8, 2023
bde3355
zorching out
Erikafox Nov 11, 2023
680d057
fix
Erikafox Nov 11, 2023
9653828
s
Erikafox Nov 11, 2023
b4c385a
lint...?
Erikafox Nov 11, 2023
7cc2c35
kill
Erikafox Nov 11, 2023
78491c2
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Nov 11, 2023
c4dc18c
i give up with good commit names
Erikafox Nov 11, 2023
4a93356
beaches...
Erikafox Nov 11, 2023
8a59f11
1
Erikafox Nov 11, 2023
aa9161e
yup
Erikafox Nov 11, 2023
ddabae2
featureforlater
Erikafox Nov 11, 2023
b6f1909
a
Erikafox Nov 11, 2023
9e13dd5
b
Erikafox Nov 13, 2023
e8735d7
e
Erikafox Nov 13, 2023
dc3cb17
fox with a keyboard
Erikafox Nov 13, 2023
7441c2e
Merge branch 'survey-scanner' of https://github.com/Bjarl/Shiptest in…
Erikafox Nov 13, 2023
d6f1d0c
Merge remote-tracking branch 'upstream/master' into survey-scanner
Erikafox Nov 13, 2023
43dfe46
unfucks the dme
Erikafox Nov 13, 2023
c689052
goodbye leftover
Erikafox Nov 13, 2023
4155331
bh
Erikafox Nov 13, 2023
46dab33
ahhh
Erikafox Nov 13, 2023
c9349e1
Apply suggestions from code review
Erikafox Nov 14, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,8 @@
name = "survey gear";
pixel_x = 30
},
/obj/item/survey_handheld/elite,
/obj/item/survey_handheld/advanced,
/obj/item/survey_handheld/advanced,
/obj/item/gear_pack/survey_pack/Experimental,
/obj/item/pinpointer/survey_data,
/obj/item/clothing/accessory/armband/science,
/obj/item/clothing/suit/toggle/labcoat/science,
/obj/item/clothing/glasses/science,
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/independent/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6518,9 +6518,6 @@
pixel_y = 5;
pixel_x = 5
},
/obj/item/survey_handheld{
pixel_x = -2
},
/obj/item/book/manual/wiki/robotics_cyborgs{
pixel_y = -1;
pixel_x = 5
Expand Down Expand Up @@ -10040,7 +10037,6 @@
pixel_y = -6
},
/obj/item/storage/wallet/random,
/obj/item/survey_handheld,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ll" = (
Expand Down
93 changes: 40 additions & 53 deletions _maps/shuttles/minutemen/minutemen_cepheus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,6 @@
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/science/robotics)
"cl" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 5
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/science/robotics)
"cF" = (
/obj/structure/table/reinforced{
color = "#c1b6a5"
Expand Down Expand Up @@ -233,6 +227,10 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/science/robotics)
"cJ" = (
/obj/machinery/porta_turret/ship/ballistic,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security)
"db" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass{
Expand Down Expand Up @@ -806,18 +804,6 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/science/robotics)
"iM" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 9
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/atmospherics)
"jl" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 6
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/security)
"jp" = (
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/techfloor/hole,
Expand All @@ -838,30 +824,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"jK" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light_switch{
pixel_x = -10;
pixel_y = 23
},
/obj/structure/closet/crate/science,
/obj/item/storage/box/stockparts/t2{
pixel_x = -5;
pixel_y = 2
},
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/survey_handheld{
pixel_x = 7
},
/obj/item/clothing/glasses/science{
pixel_x = -2;
pixel_y = -6
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"jR" = (
/obj/structure/railing{
dir = 1;
Expand Down Expand Up @@ -3001,6 +2963,10 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Fw" = (
/obj/machinery/porta_turret/ship/ballistic,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/electrical)
"Fx" = (
/obj/effect/turf_decal/siding/wood{
dir = 5
Expand Down Expand Up @@ -3818,6 +3784,10 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/security)
"OK" = (
/obj/machinery/porta_turret/ship/ballistic,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/science/robotics)
"OP" = (
/obj/effect/turf_decal/techfloor/orange,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -3929,6 +3899,29 @@
"Qf" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/central)
"Qg" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light_switch{
pixel_x = -9;
pixel_y = 21
},
/obj/structure/closet/crate/science,
/obj/item/storage/box/stockparts/t2{
pixel_x = -5;
pixel_y = 2
},
/obj/effect/spawner/lootdrop/maintenance/three,
/obj/item/clothing/glasses/science{
pixel_x = -2;
pixel_y = -6
},
/obj/machinery/firealarm/directional/north,
/obj/item/gear_pack/survey_pack,
/obj/item/pinpointer/survey_data,
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"Qr" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/science/robotics)
Expand Down Expand Up @@ -4169,12 +4162,6 @@
/obj/effect/decal/cleanable/robot_debris,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/electrical)
"SQ" = (
/obj/machinery/porta_turret/ship/ballistic{
dir = 10
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/engineering/electrical)
"Tu" = (
/obj/effect/turf_decal/techfloor{
dir = 4
Expand Down Expand Up @@ -4857,19 +4844,19 @@ zQ
zQ
zQ
zQ
iM
uX
xV
xV
El
jK
Qg
wK
lc
jp
MS
El
Xs
Xs
SQ
Fw
zQ
zQ
zQ
Expand Down Expand Up @@ -5429,7 +5416,7 @@ zQ
(27,1,1) = {"
zQ
zQ
cl
OK
Qr
Qr
qT
Expand All @@ -5447,7 +5434,7 @@ TU
lX
TU
TU
jl
cJ
zQ
zQ
"}
Expand Down
Loading