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

Mines Boom: The PR #3615

Closed
wants to merge 34 commits into from
Closed

Mines Boom: The PR #3615

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9bd82df
P curr
TotalEpicness Feb 11, 2023
3770d9f
racism
TotalEpicness Feb 12, 2023
88de7cc
shovel traits
TotalEpicness Feb 12, 2023
82fa2b1
Update code/game/objects/items/explosives/mine.dm
PhantomEpicness Feb 12, 2023
772c0cf
code review
TotalEpicness Feb 16, 2023
96f3384
Merge branch 'mineRefractor' of https://github.com/PhantomEpicness/cm…
TotalEpicness Feb 16, 2023
91159c1
fix2
PhantomEpicness Feb 17, 2023
c331fdd
review comeback
TotalEpicness Mar 7, 2023
26d6c6d
code doc fix
LynxSolstice May 30, 2023
24a7bd3
Adds the mines
LynxSolstice May 30, 2023
ec03742
Mines
LynxSolstice May 30, 2023
49c3874
micro grenade icon
LynxSolstice May 31, 2023
2c8cce0
grenade micro icon
LynxSolstice May 31, 2023
e308bd5
Antitank mine icon and micro active
LynxSolstice May 31, 2023
a4b957c
Minor name change, qdel removal (testing)
LynxSolstice May 31, 2023
c7ff27f
mine stuff
LynxSolstice May 31, 2023
3f1afad
Trigger change, icon placeholder fix, and explosive pouch change
LynxSolstice May 31, 2023
704e8ab
mine stuff things, trying to debug the damn cluster mine
LynxSolstice May 31, 2023
a7708fc
Removes the clustermine
LynxSolstice May 31, 2023
b4c0d1a
Removes the micro grenade
LynxSolstice May 31, 2023
795fe0c
Removes sleep(2)
LynxSolstice May 31, 2023
9b4aedd
description fix
LynxSolstice Jun 1, 2023
5603b52
sprites
LynxSolstice Jun 12, 2023
e801f1a
jesus christ fucking outdated for sure
LynxSolstice Jun 13, 2023
1b27530
trait fix
LynxSolstice Jun 13, 2023
7e4b873
Desc
LynxSolstice Jun 13, 2023
0c9e8fd
Adds mines to the engineer vendor
LynxSolstice Jun 13, 2023
2ff19e7
Mines Boom: The PR (thanks silencer)
LynxSolstice Jun 13, 2023
045ada4
Merge remote-tracking branch 'upstream/master' into mineRefractor
LynxSolstice Jun 13, 2023
9f273f5
fix
LynxSolstice Jun 13, 2023
74f9b66
Update code/game/objects/items/explosives/mine.dm
LynxSolstice Jun 20, 2023
68587b6
Update code/game/objects/items/explosives/mine.dm
LynxSolstice Jun 20, 2023
3a3e3ea
WIP
LynxSolstice Jun 23, 2023
4d3a126
Merge branch 'mineRefractor' of https://github.com/LynxSolstice/cmss1…
LynxSolstice Jun 23, 2023
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
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
#define TRAIT_TOOL_SIMPLE_BLOWTORCH "t_tool_simple_blowtorch"

#define TRAIT_TOOL_PEN "t_tool_pen"
#define TRAIT_TOOL_SHOVEL "t_tool_shovel"
// CLOTHING TRAITS
#define TRAIT_CLOTHING_HOOD "t_clothing_hood"

Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
list("EXPLOSIVES", -1, null, null),
list("M15 Fragmentation Grenade", round(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR),
list("M20 Claymore Anti-Personnel Mine", round(scale * 4), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR),
list("M19 Anti-Tank Mine", round(scale * 2), /obj/item/explosive/mine/bury/antitank, VENDOR_ITEM_REGULAR),
list("M40 HEDP Grenade", round(scale * 25), /obj/item/explosive/grenade/high_explosive, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Grenade", round(scale * 4), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR),
list("M40 HPDP White Phosphorus Smoke Grenade", round(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,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 (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M19 Anti Tank Mine", 18, /obj/item/explosive/mine/bury/antitank, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),

list("AMMUNITION", 0, null, null, null),
Expand Down
Loading