Skip to content

Commit c0dbcc6

Browse files
committed
adds ISG
1 parent c3c00a1 commit c0dbcc6

File tree

4 files changed

+58
-7
lines changed

4 files changed

+58
-7
lines changed

code/__DEFINES/mecha.dm

+1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@
5757
//monke edit start
5858
#define MECHA_AMMO_PIPEGUN "Improvised shell"
5959
#define MECHA_AMMO_PEASHOOTER "Peashooter bullet"
60+
#define MECHA_AMMO_ISG "IED grenades"
6061
//monke edit end

monkestation/code/datums/components/crafting/makeshift_mechs.dm

+24-4
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@
140140
/datum/crafting_recipe/pipegun_tank_ammo
141141
name = "Trash Tank Pipegun Ammobox"
142142
result = /obj/item/mecha_ammo/makeshift
143-
reqs = list(
144-
/datum/reagent/fuel = 50,
143+
reqs = list(/datum/reagent/fuel = 50,
145144
/obj/item/stack/sheet/iron = 30,
146145
)
147146
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER)
@@ -150,9 +149,30 @@
150149
/datum/crafting_recipe/peashooter_tank_ammo
151150
name = "Trash Tank Peashooter Ammobox"
152151
result = /obj/item/mecha_ammo/makeshift/peashooter
153-
reqs = list(
154-
/datum/reagent/fuel = 30,
152+
reqs = list(/datum/reagent/fuel = 30,
155153
/obj/item/stack/sheet/iron = 20,
156154
)
157155
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER)
158156
time = 0.5 SECONDS
157+
158+
/datum/crafting_recipe/isg_tank
159+
name = "Infantry Support Gun Mantlet"
160+
result = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/infantry_support_gun
161+
reqs = list(/obj/item/pipe = 4,
162+
/obj/item/tank/internals/oxygen = 2,
163+
/obj/item/assembly/igniter = 1,
164+
/obj/item/stack/cable_coil = 15,
165+
/obj/item/stack/sheet/plasteel = 10,
166+
)
167+
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WRENCH, TOOL_WIRECUTTER)
168+
time = 5 SECONDS
169+
170+
/datum/crafting_recipe/isg_tank_ammo
171+
name = "Infantry Support Gun Ammo"
172+
result = /obj/item/mecha_ammo/makeshift/isg
173+
reqs = list(/obj/item/stack/sheet/iron = 5,
174+
/obj/item/stack/cable_coil = 5,
175+
/obj/item/grenade/iedcasing = 3
176+
)
177+
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WIRECUTTER)
178+
time = 0.5 SECONDS

monkestation/code/game/mecha/makeshift/makeshift_ammo.dm

+8
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@
1212
icon_state = "peashooter_ammo"
1313
rounds = 30
1414
ammo_type = MECHA_AMMO_PEASHOOTER
15+
16+
/obj/item/mecha_ammo/makeshift/isg
17+
name = "launchable ieds"
18+
desc = "A rusty box filled with refitted IEDs, for use with a jury-rigged cannon. Cannot be primed by hand."
19+
icon_state = "isg_ammo"
20+
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2,/datum/material/gold=SMALL_MATERIAL_AMOUNT*5)
21+
rounds = 3
22+
ammo_type = MECHA_AMMO_ISG

monkestation/code/game/mecha/makeshift/makeshift_tools.dm

+25-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
equip_cooldown = 10
4040
projectile = /obj/projectile/bullet/a762/surplus
4141
projectiles = 8
42-
projectiles_cache = 8
42+
projectiles_cache = 0
4343
projectiles_cache_max = 24
4444
projectiles_per_shot = 1
4545
projectile_delay = 0.5 SECONDS
@@ -57,7 +57,7 @@
5757
equip_cooldown = 10
5858
projectile = /obj/projectile/bullet/pellet/shotgun_improvised
5959
projectiles = 15
60-
projectiles_cache = 15
60+
projectiles_cache = 0
6161
projectiles_cache_max = 30
6262
projectiles_per_shot = 3
6363
projectile_delay = 0.2 SECONDS
@@ -67,7 +67,7 @@
6767
mech_flags = EXOSUIT_MODULE_TRASHTANK
6868

6969
/obj/item/mecha_parts/mecha_equipment/tankupgrade
70-
name = "Trash Tank Armor Plating"
70+
name = "trash tank armor plating"
7171
desc = "A jumble of whatever scrap that someone can scrounge up that is able to beef up a trash tank somewhat."
7272
icon_state = "tank_armor"
7373
mech_flags = EXOSUIT_MODULE_TRASHTANK
@@ -84,3 +84,25 @@
8484
/obj/item/mecha_parts/mecha_equipment/tankupgrade/attach(obj/vehicle/sealed/mecha/trash_tank/tank, attach_right = FALSE)
8585
tank.upgrade()
8686
playsound(get_turf(tank),'sound/items/ratchet.ogg',50,TRUE)
87+
88+
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/infantry_support_gun
89+
name = "infantry support gun breech"
90+
desc = "an improvised mantlet fitted to launch IED's torwards enemies."
91+
icon_state = "mecha_supportgun"
92+
harmful = TRUE
93+
ammo_type = MECHA_AMMO_ISG
94+
mech_flags = EXOSUIT_MODULE_TRASHTANK
95+
var/det_time = 3 SECONDS
96+
equip_cooldown = 60
97+
projectile = /obj/item/grenade/iedcasing/spawned
98+
missile_speed = 1.5
99+
projectiles = 1
100+
projectiles_cache = 0
101+
projectiles_cache_max = 6
102+
103+
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/infantry_support_gun/proj_init(obj/item/grenade/flashbang/F, mob/user)
104+
var/turf/T = get_turf(src)
105+
message_admins("[ADMIN_LOOKUPFLW(user)] fired a [F] in [ADMIN_VERBOSEJMP(T)]")
106+
user.log_message("fired a [F] in [AREACOORD(T)].", LOG_GAME)
107+
user.log_message("fired a [F] in [AREACOORD(T)].", LOG_ATTACK)
108+
addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/iedcasing/spawned, detonate)), det_time)

0 commit comments

Comments
 (0)