(upstream PR 82113)

Bird-Lounge · Mar 21, 2024 · ecb37f1 · ecb37f1
1 parent 6d3a8f0
commit ecb37f1
Show file tree

Hide file tree

Showing 3 changed files with 556 additions and 0 deletions.
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
@@ -107,3 +107,6 @@
 
 /obj/effect/forcefield/cosmic_field/fast
 	initial_duration = 5 SECONDS
+
+/obj/effect/forcefield/cosmic_field/extrafast
+	initial_duration = 2.5 SECONDS
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
@@ -98,6 +98,20 @@
 	style = STYLE_SYNDICATE
 	specialised = TRUE
 
+<<<<<<< HEAD
+=======
+/obj/structure/closet/supplypod/deadmatch_missile
+	name = "cruise missile"
+	desc = "A big ass missile, likely launched from some far-off deep space missile silo."
+	style = STYLE_RED_MISSILE
+	explosionSize = list(0,1,2,2)
+	effectShrapnel = TRUE
+	specialised = TRUE
+	delays = list(POD_TRANSIT = 2.6 SECONDS, POD_FALLING = 0.4 SECONDS)
+	effectMissile = TRUE
+	shrapnel_type = /obj/projectile/bullet/shrapnel/short_range
+
+>>>>>>> 89a3734d990 (Deathmatch Modifiers Tweaks and Additions (#82113))
 /datum/armor/closet_supplypod
 	melee = 30
 	bullet = 50