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

Attack chain migration: /obj/machinery #27784

Merged
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fd4a747
one at a time let's go
warriorstar-orion Dec 8, 2024
fea26f1
air alarm
warriorstar-orion Dec 8, 2024
f24ab9f
so many
warriorstar-orion Dec 8, 2024
fec795b
meh
warriorstar-orion Dec 8, 2024
154ec25
hell
warriorstar-orion Dec 9, 2024
efe9c4d
hell
warriorstar-orion Dec 9, 2024
85ef735
hmm
warriorstar-orion Dec 12, 2024
3d01d51
Attack chain migration: /obj/machinery
warriorstar-orion Dec 6, 2024
82918b1
what the fuck?
warriorstar-orion Dec 31, 2024
0b181e2
hell
warriorstar-orion Jan 1, 2025
e5923a9
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 10, 2025
204b6b3
review fixes
warriorstar-orion Jan 10, 2025
a409091
whoops
warriorstar-orion Jan 10, 2025
e34414a
fix build
warriorstar-orion Jan 10, 2025
dd3e054
nuke fixes, more tests
warriorstar-orion Jan 10, 2025
db39f38
Merge branch 'attack-chain-migration/machinery' of github.com:warrior…
warriorstar-orion Jan 16, 2025
4b019b4
gland dispsenser and start of autolathe test
warriorstar-orion Jan 17, 2025
cb75313
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 17, 2025
49adeff
var renames
warriorstar-orion Jan 17, 2025
38937f0
small fixes
warriorstar-orion Jan 18, 2025
eba8331
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 18, 2025
1469fc0
i tire of life
warriorstar-orion Jan 18, 2025
67b5fe8
more tests
warriorstar-orion Jan 18, 2025
5ce8c3f
more tests
warriorstar-orion Jan 18, 2025
552a5e3
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 18, 2025
1202c99
more tests
warriorstar-orion Jan 18, 2025
b0d7067
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 19, 2025
4fcc452
shrink map
warriorstar-orion Jan 19, 2025
9024c12
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 20, 2025
ccb8cd7
customize autolathe design disk load delay
warriorstar-orion Jan 20, 2025
67dcfda
cell charger
warriorstar-orion Jan 20, 2025
3a23acf
fire alarm frame installation test
warriorstar-orion Jan 20, 2025
d48413b
funny and burz reviews
warriorstar-orion Jan 20, 2025
01adf5d
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 24, 2025
3199696
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 25, 2025
07d931d
nuke fixes
warriorstar-orion Jan 25, 2025
4cceb9d
Merge remote-tracking branch 'upstream/master' into attack-chain-migr…
warriorstar-orion Jan 25, 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
fire alarm frame installation test
warriorstar-orion committed Jan 20, 2025
commit 3a23acf7970ec98cd97b3f73a9bb43f4e5fecc22
2 changes: 1 addition & 1 deletion _maps/map_files/tests/test_attack_chain_machinery.dmm
Original file line number Diff line number Diff line change
@@ -440,7 +440,7 @@ Au
qc
qc
qc
LT
qc
qc
Au
lM
3 changes: 2 additions & 1 deletion code/tests/_game_test_puppeteer.dm
Original file line number Diff line number Diff line change
@@ -66,12 +66,13 @@

/datum/test_puppeteer/proc/change_turf_nearby(turf_type, direction = -1)
var/turf/T
var/turf/center = get_turf(puppet)
if(direction >= 0)
T = get_step(puppet, direction)
else
// just check for any contents, not blocked_turf which includes turf density
// (which we don't really care about)
for(var/turf/nearby in RANGE_TURFS(1, puppet))
for(var/turf/nearby in RANGE_TURFS(1, center))
if(!length(nearby.contents))
T = nearby

19 changes: 19 additions & 0 deletions code/tests/attack_chain/test_attack_chain_machinery.dm
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@

// DNA Scanner
var/obj/scanner = teleport_to_first(player, /obj/machinery/dna_scannernew)
var/area/admin_area = get_area(player.puppet)
player.spawn_obj_in_hand(/obj/item/reagent_containers/glass/beaker)
player.click_on(scanner)
TEST_ASSERT_LAST_CHATLOG(player, "You add a beaker")
@@ -139,3 +140,21 @@
player.click_on(cell_charger)
TEST_ASSERT_LAST_CHATLOG(player, "replaced with quadratic capacitor")
qdel(rped)

player.puppet.forceMove(top_right.loc)
var/turf/wall = player.change_turf_nearby(/turf/simulated/wall, EAST)
player.spawn_obj_in_hand(/obj/item/mounted/frame/firealarm)
admin_area.requires_power = TRUE
player.click_on(wall)
admin_area.requires_power = FALSE
player.spawn_obj_in_hand(/obj/item/firealarm_electronics)
var/obj/firealarm_frame = player.find_nearby(/obj/machinery/firealarm)
player.click_on(firealarm_frame)
TEST_ASSERT_LAST_CHATLOG(player, "You insert the circuit")
var/obj/cables = player.spawn_obj_in_hand(/obj/item/stack/cable_coil/ten)
player.click_on(firealarm_frame)
TEST_ASSERT_LAST_CHATLOG(player, "You wire")
qdel(cables)
player.retrieve(screwdriver)
player.click_on(firealarm_frame)
TEST_ASSERT_LAST_CHATLOG(player, "You close the panel")