Skip to content

Commit

Permalink
needsEffectsnBalancing
Browse files Browse the repository at this point in the history
  • Loading branch information
@PhantomEpicness
PhantomEpicness committed Nov 24, 2023
1 parent 108ae72 commit daf8a19
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 6 deletions.
11 changes: 11 additions & 0 deletions code/datums/supply_packs/explosives.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@
containername = "\improper explosive M40 HEDP grenades crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_sebb
name = "M40 HEDP blast grenades crate (x6)"
contains = list(
/obj/item/storage/box/packet/sebb,
/obj/item/storage/box/packet/sebb,
)
cost = 30
containertype = /obj/structure/closet/crate/explosives
containername = "\improper explosive M40 HEDP grenades crate (WARNING)"
group = "Explosives"

/datum/supply_packs/explosives_hedp
name = "M40 HEDP blast grenade box crate (x25)"
contains = list(
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
list("HEDP Grenade Pack", 15, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
list("HEFA Grenade Pack", 15, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
list("WP Grenade Pack", 15, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Pack", 15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("RAIL ATTACHMENTS", 0, null, null, null),
list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
list("M74 AGM-Hornet Shell", round(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),
list("M40 HIRR Baton Slug", round(scale * 8), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", round(scale * 3), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade", round(scale * 5), /obj/item/explosive/grenade/sebb/primed, null, VENDOR_ITEM_REGULAR),
list("Plastic Explosives", round(scale * 3), /obj/item/explosive/plastic, VENDOR_ITEM_REGULAR),
list("Breaching Charge", round(scale * 2), /obj/item/explosive/plastic/breaching_charge, VENDOR_ITEM_REGULAR),

Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
list("Super-Capacity Power Cell", 10, /obj/item/cell/super, null, VENDOR_ITEM_REGULAR),
list("ES-11 Mobile Fuel Canister", 4, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR),


list("EXPLOSIVES", 0, null, null, null),
list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
Expand All @@ -37,6 +38,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Packet (x3 grenades)", 18, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Packet (x3 grenades)", 18, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("MEDICAL SUPPLIES", 0, null, null, null),
list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Packet (x3 grenades)", 18, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
Expand Down
12 changes: 12 additions & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list(
list("M74 AGM-F Fragmentation Grenades x6", 40, /obj/effect/essentials_set/agmf_6_pack, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-I Incendiary Grenades x6", 40, /obj/effect/essentials_set/agmi_6_pack, null, VENDOR_ITEM_REGULAR),
list("M74 AGM-S Smoke Grenades x6", 20, /obj/effect/essentials_set/agms_6_pack, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Pack x6", 40, /obj/effect/essentials_set/sebb_6_pack, null, VENDOR_ITEM_REGULAR),

list("EXTRA FLAMETHROWER TANKS", 0, null, null, null),
list("Large Incinerator Tank", 40, /obj/item/ammo_magazine/flamer_tank/large, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -209,6 +210,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list(
/obj/item/explosive/grenade/high_explosive/airburst,
)

/obj/effect/essentials_set/sebb_6_pack
spawned_gear_list = list(
/obj/item/explosive/grenade/sebb,
/obj/item/explosive/grenade/sebb,
/obj/item/explosive/grenade/sebb,
/obj/item/explosive/grenade/sebb,
/obj/item/explosive/grenade/sebb,
/obj/item/explosive/grenade/sebb,
)


/obj/effect/essentials_set/agmi_6_pack
spawned_gear_list = list(
/obj/item/explosive/grenade/incendiary/airburst,
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),
list("G2 Electroshock Grenade Packet (x3 grenades)", 18, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("RESTRICTED FIREARMS", 0, null, null, null),
list("VP78 Pistol", 10, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
Expand Down
11 changes: 7 additions & 4 deletions code/game/objects/items/explosives/grenades/marines.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,15 @@
if(user.action_busy)
return

var/turf/T = target
to_chat(user, SPAN_NOTICE("You switch \the [src] into landmind mode and start burying it..."))
if(target != user.loc)
return

to_chat(user, SPAN_NOTICE("You switch \the [src] into landmine mode and start burying it..."))
playsound(user.loc, 'sound/effects/thud.ogg', 100, 6)
if(!do_after(user,20 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
to_chat(user, SPAN_NOTICE("You stop digging."))
return
new /obj/item/explosive/mine/sebb(T.loc)
new /obj/item/explosive/mine/sebb(user.loc)
qdel(src)

/obj/item/explosive/grenade/sebb/activate()
Expand Down Expand Up @@ -792,12 +794,13 @@


/obj/item/explosive/grenade/sebb/primed
icon_state = "grenade_sebb"
name = "\improper G2 Electroshock grenade"
desc = "A G2 Electroshock Grenade, looks like its quite angry! Oh shit!"
det_time = 10

/obj/item/explosive/grenade/sebb/primed/New()
prime()
activate()

/obj/effect/overlay/sebb
name = "Danger"
Expand Down
7 changes: 5 additions & 2 deletions code/game/objects/items/explosives/mine.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,19 @@


/obj/item/explosive/mine/sebb
name = "\improper G2 Electroshock grenade"
icon_state = "grenade_sebb_planted"
desc = "A G2 electroshock grenade planted as a landmine"
map_deployed = TRUE

/obj/item/explosive/mine/sebb/disarm()
. = ..()
new /obj/item/explosive/grenade/sebb(src)
qdel(src.loc)
qdel(src)

/obj/item/explosive/mine/sebb/prime()
set waitfor = 0
new /obj/item/explosive/grenade/sebb/primed(src)
new /obj/item/explosive/grenade/sebb/primed(src.loc)
if(!QDELETED(src))
disarm()

Expand Down
6 changes: 6 additions & 0 deletions code/modules/projectiles/ammo_boxes/grenade_packets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,9 @@ var/list/grenade_packets = list(
desc = "It contains three R2175/B HIDP grenades. Handle with care."
icon_state = "hidp_packet"
content_type = /obj/item/explosive/grenade/incendiary/rmc

/obj/item/storage/box/packet/sebb
name = "\improper G2 Electroshock grenade packet"
desc = "It contains three G2 Electroshock grenades. Handle with care."
icon_state = "sebb_packet"
content_type = /obj/item/explosive/grenade/sebb
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
View file
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
View file
Binary file not shown.
Binary file modified icons/obj/items/weapons/grenade.dmi
View file
Binary file not shown.

0 comments on commit daf8a19

Please sign in to comment.