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

Fixes lavaland syndicate station's explosives being able to be picked up #12033

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+14 −3
Open

Fixes lavaland syndicate station's explosives being able to be picked up #12033

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2b8b03
wew
XeonMations Dec 14, 2024
ecf34cc
Update syndicatebomb.dm
XeonMations Dec 14, 2024
d40149d
kick the bot until it works
XeonMations Dec 14, 2024
d4661ea
Update code/game/turfs/closed/wall/mineral_walls.dm
XeonMations Dec 24, 2024
ca06cf7
Revert "Update code/game/turfs/closed/wall/mineral_walls.dm"
XeonMations Dec 24, 2024
e4b4268
Update mineral_walls.dm
XeonMations Dec 24, 2024
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
6 changes: 6 additions & 0 deletions code/game/machinery/syndicatebomb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,12 @@
range_light = 20
range_flame = 20

// Special bomb core for inside the lavaland syndicate base walls. Players should not be able to interact with this.
/obj/item/bombcore/large/syndicate_base
installed = TRUE
anchored = TRUE
invisibility = INVISIBILITY_OBSERVER
Comment on lines +402 to +406
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually needed if the bombcore is force moved inside the wall anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because it does still appear in the context menu.


/obj/item/bombcore/miniature
name = "small bomb core"
w_class = WEIGHT_CLASS_SMALL
Expand Down
12 changes: 9 additions & 3 deletions code/game/turfs/closed/wall/mineral_walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,23 @@
icon_state = "map-overspace"
fixed_underlay = list("space"=1)

/////////////////////Lavaland Base Syndicate Explosive Walls /////////////////////

/turf/closed/wall/mineral/plastitanium/explosive
var/obj/item/bombcore/large/bombcore
var/obj/item/bombcore/large/syndicate_base/bombcore

/turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload)
. = ..()
bombcore = new(get_turf(src))
bombcore.installed = TRUE
bombcore = new /obj/item/bombcore/large/syndicate_base(get_turf(src))
bombcore.forceMove(src)
XeonMations marked this conversation as resolved.
Show resolved Hide resolved

/turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity)
bombcore.detonate()

/turf/closed/wall/mineral/plastitanium/explosive/Destroy()
qdel(bombcore)
..()

//have to copypaste this code
/turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T)
if(T.type != type)
Expand Down
Loading