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

Jump to bottom

Gang locker movement #18561

Merged
merged 8 commits into from
May 20, 2024
Merged

Gang locker movement #18561

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f656bb7
gang lockers can now be teleported
TDHooligan Apr 19, 2024
1228339
Merge branch 'master' into locker-tps
TDHooligan Apr 24, 2024
8ae8c00
cd on crate drop
TDHooligan May 19, 2024
a27fe5a
fixes
TDHooligan May 19, 2024
0bb45bf
nulls for abilholders
TDHooligan May 19, 2024
778f52b
Merge branch 'master' into locker-tps
TDHooligan May 20, 2024
96528c9
refactor locker abils
TDHooligan May 20, 2024
6ec02e9
tag bugfix
TDHooligan May 20, 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
5 changes: 5 additions & 0 deletions code/datums/controllers/process/gang.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@
imgroup.add_image(objective_image)
broadcast_to_all_gangs("<span style='font-size:24px'> We're dropping off weapons & ammunition at <b>\the [drop_zone.name]!</b> It'll arrive in [GANG_CRATE_DROP_TIME/(1 MINUTE)] minute[s_es(GANG_CRATE_DROP_TIME/(1 MINUTE))] so get fortifying!</span>")

var/datum/game_mode/gang/gamemode = ticker.mode
for(var/datum/gang/targetGang as anything in gamemode.gangs) //create loot bags for this gang (so they get pinged)
var/datum/targetable/abil = targetGang.leader.current.getAbility(/datum/targetable/gang/move_gang_base)
TDHooligan marked this conversation as resolved.
Show resolved Hide resolved
abil.last_cast = world.time + GANG_CRATE_DROP_TIME + 5 MINUTES
targetGang.leader.current.abilityHolder.updateButtons()

SPAWN(GANG_CRATE_DROP_TIME - 30 SECONDS)
if(drop_zone != null)
Expand Down
Loading