Skip to content

Commit

Permalink
Boomvest up 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MevludinDvivedi committed Dec 15, 2024
1 parent 499dc6e commit b56ecdc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions code/game/objects/items/explosives/bombvest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
return
if(bomb_message)
activator.say("[bomb_message]!!")
if(!do_after(activator, 0.5 SECONDS, IGNORE_USER_LOC_CHANGE, src, BUSY_ICON_DANGER))
playsound(activator, 'sound/misc/allahuakbar.ogg', 50)
if(!do_after(activator, 1 SECONDS, IGNORE_USER_LOC_CHANGE, src, BUSY_ICON_DANGER))
return FALSE
boom(activator)

Expand All @@ -59,7 +60,7 @@
message_admins("[activator] has detonated an explosive vest with no warcry at [ADMIN_VERBOSEJMP(target)]")
log_game("[activator] has detonated an explosive vest with no warcry at [AREACOORD(target)]")

cell_explosion(target, 275, 65)
cell_explosion(target, 415, 83)
flame_radius(5, target)

activator.ex_act(500)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/machinery/vending/marine_vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@
/obj/item/beacon/supply_beacon = 1,
/obj/item/explosive/plastique = 5,
/obj/item/fulton_extraction_pack = 2,
/obj/item/clothing/suit/storage/marine/boomvest = 20,
/obj/item/clothing/suit/storage/marine/boomvest = 15,
/obj/item/radio/headset/mainship/marine/alpha = -1,
/obj/item/radio/headset/mainship/marine/bravo = -1,
/obj/item/radio/headset/mainship/marine/charlie = -1,
Expand Down
5 changes: 5 additions & 0 deletions code/modules/reqs/supplypacks/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
contains = list(/obj/item/weapon/shield/riot/marine/deployable)
cost = 30

/datum/supply_packs/armor/boomvest
name = "Tactical boomvest"
contains = list(/obj/item/clothing/suit/storage/marine/boomvest)
cost = 50

/datum/supply_packs/armor/b18
name = "B18 Armor Set"
contains = list(
Expand Down
Binary file added sound/misc/allahuakbar.ogg
Binary file not shown.

0 comments on commit b56ecdc

Please sign in to comment.