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.

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

Mines Boom 2: non-electric booglaoo #6906

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
41e48e3
aaaaaaaaaa
LynxSolstice Apr 1, 2023
2fe23cd
Merge remote-tracking branch 'upstream'
LynxSolstice Apr 1, 2023
6f4420e
Merge remote-tracking branch 'upstream'
LynxSolstice Apr 16, 2023
be7d95e
Merge remote-tracking branch 'upstream'
LynxSolstice Apr 20, 2023
2de2b0b
Merge remote-tracking branch 'upstream/master'
LynxSolstice May 21, 2023
942919a
Merge remote-tracking branch 'upstream'
LynxSolstice Feb 4, 2024
08990e2
Merge remote-tracking branch 'upstream'
LynxSolstice Aug 9, 2024
5113822
Initial Commit, reconstructed and updated version of my original 2023 PR
LynxSolstice Aug 9, 2024
33ccab0
Upped the damage a bit since people complained it was too low
LynxSolstice Aug 10, 2024
411262f
Merge remote-tracking branch 'upstream' into antitank_mine
LynxSolstice Aug 11, 2024
1694068
layer adjustment
LynxSolstice Aug 11, 2024
1c087fb
fixes layering
LynxSolstice Aug 11, 2024
9db81fb
Removes shrapnel since it's a shaped charge
LynxSolstice Aug 11, 2024
c0b47c9
made the mine SLIGHTLY cheaper
LynxSolstice Aug 11, 2024
9639276
Updated damage to what I thought I set it as, 200
LynxSolstice Aug 11, 2024
014e327
Merge branch 'master' into antitank_mine
LynxSolstice Aug 11, 2024
ad6928e
Adds a minebox for Sprite approval
LynxSolstice Aug 12, 2024
289ea84
Merge branch 'antitank_mine' of https://github.com/LynxSolstice/cmss1…
LynxSolstice Aug 12, 2024
917ee3f
code prettiness
LynxSolstice Aug 12, 2024
4f6679e
error :(
LynxSolstice Aug 12, 2024
a8114e3
Merge branch 'master' into antitank_mine
LynxSolstice Aug 12, 2024
9a8e6ba
code standards
LynxSolstice Aug 12, 2024
36c3c00
Merge branch 'antitank_mine' of https://github.com/LynxSolstice/cmss1…
LynxSolstice Aug 12, 2024
2516f4c
It is buried
LynxSolstice Aug 12, 2024
1928f7e
Merge remote-tracking branch 'upstream' into antitank_mine
LynxSolstice Aug 27, 2024
23f5efc
Merge remote-tracking branch 'upstream' into antitank_mine
LynxSolstice Aug 27, 2024
61433a1
merge conflicts
LynxSolstice Aug 27, 2024
00936d5
Merge branch 'master' into antitank_mine
LynxSolstice Aug 27, 2024
831c47a
Addresses CI I hope
LynxSolstice Oct 13, 2024
8885b07
Merge branch 'antitank_mine' of https://github.com/LynxSolstice/cmss1…
LynxSolstice Oct 13, 2024
bd47dbd
Merge branch 'master' into antitank_mine
LynxSolstice Oct 13, 2024
f4ccbda
CI
LynxSolstice Oct 13, 2024
cb5c3ad
grenades
LynxSolstice Oct 31, 2024
a840c45
mines
LynxSolstice Oct 31, 2024
5ff92e6
icons
LynxSolstice Oct 31, 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
2 changes: 1 addition & 1 deletion code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
#define TRAIT_TOOL_SIMPLE_BLOWTORCH "t_tool_simple_blowtorch"

#define TRAIT_TOOL_PEN "t_tool_pen"

#define TRAIT_TOOL_SHOVEL "t_tool_shovel"
/// Can lockout blackmarket from ASRS console circuits.
#define TRAIT_TOOL_TRADEBAND "t_tool_tradeband"

Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
// For the record, WHAT THE HELL IS THIS METHOD OF DOING IT?
#define can_puncture(W) (isitem(W) && (W.sharp || W.heat_source >= 400 || \
HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER) || istype(W, /obj/item/tool/pen ) || istype(W, /obj/item/tool/shovel)) \
HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER) || istype(W, /obj/item/tool/pen ) || HAS_TRAIT(W, TRAIT_TOOL_SHOVEL)) \
)

//Offuscate x for coord system
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
list("EXPLOSIVES", -1, null, null),
list("M15 Fragmentation Grenade", floor(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR),
list("M20 Claymore Anti-Personnel Mine", floor(scale * 4), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR),
list("M19 Anti-Tank Mine", round(scale * 3), /obj/item/explosive/mine/bury/antitank, VENDOR_ITEM_REGULAR),
list("M40 HEDP Grenade", floor(scale * 25), /obj/item/explosive/grenade/high_explosive, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Grenade", floor(scale * 4), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR),
list("M40 CCDP Chemical Compound Smoke Grenade", floor(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, 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 (x5 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M19 Anti Tank Mine Box (x3 mines)", 30, /obj/item/storage/box/explosive/antitank_mine, 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)", 16, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

Expand Down
Loading
Loading