Skip to content

Commit 9107436

Browse files
authored
Merge pull request #10 from cuberound/comments
2 parents 7605fba + b767ad3 commit 9107436

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

code/datums/ammo/rocket.dm

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,21 @@
312312
flags_ammo_behavior = AMMO_SKIPS_ALIENS|AMMO_HITS_TARGET_TURF|AMMO_SNIPER //sniper as we want good acc
313313
name = "M5510 Laser-Guided Rocket"
314314
icon_state = "brute"
315+
///Chance per tile to spawn smoke
315316
var/smoke_chance = 30
317+
///Chance per tile to spawn sparks
316318
var/spark_chance = 30
319+
///Chance per tile to spawn flame tile
317320
var/fire_chance = 30
321+
///Chance for impacted object to be thrown
318322
var/throw_chance = 20
323+
///Damage in central area
319324
var/structure_damage = 1200
325+
///Lower bound of damage on left and right blast edge
320326
var/edge_lower_dmg = 400
327+
///Lower bound of damage on left and right blast edge
321328
var/edge_upper_dmg = 700
329+
///blast length, creates 3 wide 5x5 box fallowed by 3 wide blast
322330
var/max_distance = 7
323331

324332
/datum/ammo/rocket/brute/on_hit_mob(mob/mob, obj/projectile/projectile)
@@ -366,7 +374,7 @@
366374
INVOKE_ASYNC(src, PROC_REF(detonate),left_turf, initial_location, cleared_locations,edge)
367375
cleared_locations |= right_turf
368376
cleared_locations |= left_turf
369-
sleep(1)
377+
sleep(1) //for effect of traveling blastwave rather then instant action in whole impact area
370378

371379

372380
/datum/ammo/rocket/brute/proc/detonate(turf/location, turf/initial_location, list/detonated_locations, edge = FALSE)

code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
99
list("JIMA Planted Flag", 0, /obj/item/defenses/handheld/planted_flag, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
1010
list("UA 42-F Sentry Flamer", 0, /obj/item/defenses/handheld/sentry/flamer, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
1111
list("UA 571-C Sentry Gun", 0, /obj/item/defenses/handheld/sentry, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
12-
list("M6H-BRUTE",0, /obj/item/storage/belt/gun/brutepack/full, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
12+
list("M6H-BRUTE Breaching Launcher",0, /obj/item/storage/belt/gun/brutepack/full, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY),
1313
list("Sentry Upgrade kit", 15, /obj/item/engi_upgrade_kit, null, VENDOR_ITEM_REGULAR),
1414

1515

0 commit comments

Comments
 (0)