Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Debris follow fix 2: Electric Boogaloo #7334

Merged
Amelia0010 merged 19 commits into from
Dec 24, 2019
Merged

Debris follow fix 2: Electric Boogaloo #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ac0ff5d
Merge pull request #1 from yogstation13/master
Mr-Space Nov 24, 2019
c1c6e96
Update (#2)
Mr-Space Dec 14, 2019
70bddcf
Revert "Update (#2)"
Mr-Space Dec 14, 2019
febdb5c
Merge pull request #4 from Mr-Space/revert-2-master
Mr-Space Dec 14, 2019
7b5bfe4
Merge pull request #5 from yogstation13/master
Mr-Space Dec 14, 2019
06c063b
adios duckos
Mr-Space Dec 14, 2019
7ca6cd3
adios rod
Mr-Space Dec 14, 2019
a165991
another rod gone
Mr-Space Dec 14, 2019
0e24d18
Revert "another rod gone"
Mr-Space Dec 14, 2019
08503db
Revert "adios rod"
Mr-Space Dec 14, 2019
1af7be5
fuck
Mr-Space Dec 14, 2019
c42e1da
pls work this time
Mr-Space Dec 14, 2019
9eb90e5
we var now
Mr-Space Dec 21, 2019
2ee444c
Revert "fuck"
Mr-Space Dec 23, 2019
234f09a
Revert "pls work this time"
Mr-Space Dec 23, 2019
8571b4b
notdebris edit
Mr-Space Dec 23, 2019
8274a66
Revert "notdebris edit"
Mr-Space Dec 23, 2019
c307947
just testin somethin
Mr-Space Dec 23, 2019
41aec33
well that was easy
Mr-Space Dec 23, 2019
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
1 change: 1 addition & 0 deletions _maps/RandomRuins/SpaceRuins/Academy.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@
"cF" = (
/obj/effect/immovablerod{
dir = 4
notdebris = 1
},
/obj/structure/cable,
/obj/structure/cable{
Expand Down
1 change: 1 addition & 0 deletions _maps/RandomZLevels/Academy.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4019,6 +4019,7 @@
"lK" = (
/obj/effect/immovablerod{
dir = 4
notdebris = 1
},
/obj/structure/cable,
/obj/structure/cable{
Expand Down
4 changes: 3 additions & 1 deletion _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20593,7 +20593,9 @@
/turf/closed/indestructible/riveted,
/area/centcom/testchamber)
"TY" = (
/obj/effect/immovablerod/duck,
/obj/effect/immovablerod/duck{
notdebris = 1
},
/turf/open/floor/engine,
/area/centcom/testchamber)
"Ub" = (
Expand Down
3 changes: 3 additions & 0 deletions code/modules/events/immovable_rod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
var/destination
var/notify = TRUE
var/atom/special_target
var/notdebris = FALSE

/obj/effect/immovablerod/New(atom/start, atom/end, aimed_at)
..()
Expand All @@ -62,6 +63,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
destination = end
special_target = aimed_at
GLOB.poi_list += src
if(notdebris)
SSaugury.unregister_doom(src)

var/special_target_valid = FALSE
if(special_target)
Expand Down
3 changes: 2 additions & 1 deletion yogstation/code/modules/events/immovable_duck.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
. = ..()
SpinAnimation(24,-1)


/obj/effect/immovablerod/duck/Bump(atom/clong)
if(prob(90))
playsound(src, 'yogstation/sound/misc/quack.ogg', 50, 1)
Expand Down Expand Up @@ -68,4 +69,4 @@
var/mob/living/carbon/human/H = L
H.adjustBruteLoss(160)
if(L && (L.density || prob(10)))
L.ex_act(EXPLODE_HEAVY)
L.ex_act(EXPLODE_HEAVY)