Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit a92342c

Browse files
PaxilmaniacPaxilmaniac
committed
fixes uhh everything else :)
1 parent 2c7477e commit a92342c

File tree

6 files changed

+251
-5
lines changed

6 files changed

+251
-5
lines changed

‎code/game/objects/items/grenades/flashbang.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737

3838
//Flash
3939
if(living_mob.flash_act(affect_silicon = 1))
40-
living_mob.Paralyze(max(20/max(1, distance), 5))
40+
// living_mob.Paralyze(max(20/max(1, distance), 5)) // DOPPLETHAL REMOVAL
4141
living_mob.Knockdown(max(200/max(1, distance), 60))
4242

4343
//Bang
4444
if(!distance || loc == living_mob || loc == living_mob.loc)
45-
living_mob.Paralyze(20)
45+
// living_mob.Paralyze(20) // DOPPLETHAL REMOVAL
4646
living_mob.Knockdown(200)
4747
living_mob.soundbang_act(1, 200, 10, 15)
4848
else
4949
if(distance <= 1) // Adds more stun as to not prime n' pull (#45381)
50-
living_mob.Paralyze(5)
50+
// living_mob.Paralyze(5) // DOPPLETHAL REMOVAL
5151
living_mob.Knockdown(30)
5252
living_mob.soundbang_act(1, max(200 / max(1, distance), 60), rand(0, 5))
5353

‎modular_lethal_doppler/epic_loot/code/container_overrides.dm

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/obj/structure/maintenance_loot_structure/ammo_box
2+
name = "ammo crate"
3+
desc = "A small box for holding ammo away from the elements."
4+
loot_weighted_list = list(
5+
/obj/effect/spawner/random/epic_loot/bullet_piles = 1,
6+
/obj/effect/spawner/random/epic_loot/magazines = 1,
7+
)
8+
9+
/obj/structure/maintenance_loot_structure/grenade_box
10+
name = "explosives crate"
11+
desc = "A reinforced box for holding things that explode."
12+
loot_weighted_list = list(
13+
/obj/effect/spawner/random/epic_loot/random_explosives = 1,
14+
)
15+
16+
/obj/structure/maintenance_loot_structure/gun_box
17+
name = "weapon crate"
18+
desc = "A long weapons case for the safe shipping of firearms and accessories."
19+
loot_weighted_list = list(
20+
/obj/effect/spawner/random/epic_loot/random_other_military_loot = 2,
21+
/obj/effect/spawner/random/epic_loot/bullet_piles = 1,
22+
/obj/effect/spawner/random/epic_loot/magazines = 1,
23+
/obj/effect/spawner/random/epic_loot/war = 2,
24+
)
25+
26+
/obj/structure/maintenance_loot_structure/large_crate/military
27+
name = "reinforced transport crate"
28+
desc = "A large crate for transporting equally large amounts of military hardware."
29+
icon_state = "supplydrop_green"
30+
loot_weighted_list = list(
31+
/obj/effect/spawner/random/epic_loot/random_other_military_loot = 1,
32+
/obj/effect/spawner/random/epic_loot/medical_everything = 1,
33+
/obj/effect/spawner/random/epic_loot/bullet_piles = 1,
34+
/obj/effect/spawner/random/epic_loot/magazines = 1,
35+
/obj/effect/spawner/random/epic_loot/war = 1,
36+
)
37+
38+
/obj/structure/maintenance_loot_structure/military_case
39+
name = "military shipping crate"
40+
desc = "A reinforced shipping crate for the transport of military hardware."
41+
loot_weighted_list = list(
42+
/obj/effect/spawner/random/epic_loot/random_other_military_loot = 1,
43+
/obj/effect/spawner/random/epic_loot/medical_everything = 1,
44+
/obj/effect/spawner/random/epic_loot/bullet_piles = 1,
45+
/obj/effect/spawner/random/epic_loot/magazines = 1,
46+
/obj/effect/spawner/random/epic_loot/war = 1,
47+
)

‎modular_lethal_doppler/epic_loot/code/loot_spawns.dm

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
// Ammo and such
2+
3+
/obj/effect/spawner/random/epic_loot/bullet_piles
4+
name = "random bullet piles"
5+
icon_state = "random_medpen_spawner"
6+
loot = list(
7+
/obj/item/ammo_box/magazine/ammo_stack/c27_54cesarzowa/prefilled = 3,
8+
/obj/item/ammo_box/magazine/ammo_stack/c27_54cesarzowa/prefilled/tracer = 3,
9+
/obj/item/ammo_box/magazine/ammo_stack/c27_54cesarzowa/prefilled/ultrakill = 2,
10+
/obj/item/ammo_box/magazine/ammo_stack/c12chinmoku/prefilled = 3,
11+
/obj/item/ammo_box/magazine/ammo_stack/c12chinmoku/prefilled/tracer = 3,
12+
/obj/item/ammo_box/magazine/ammo_stack/c12chinmoku/prefilled/special = 2,
13+
/obj/item/ammo_box/magazine/ammo_stack/europan4mm/prefilled = 3,
14+
/obj/item/ammo_box/magazine/ammo_stack/c8marsian/prefilled = 3,
15+
/obj/item/ammo_box/magazine/ammo_stack/c8marsian/prefilled/shockwave = 2,
16+
/obj/item/ammo_box/magazine/ammo_stack/c8marsian/prefilled/piercing = 2,
17+
/obj/item/ammo_box/magazine/ammo_stack/s6gauge/prefilled = 3,
18+
/obj/item/ammo_box/magazine/ammo_stack/s6gauge/prefilled/longshot = 2,
19+
/obj/item/ammo_box/magazine/ammo_stack/s6gauge/prefilled/slug = 3,
20+
/obj/item/ammo_box/magazine/ammo_stack/s6gauge/prefilled/flash = 2,
21+
/obj/item/ammo_box/magazine/ammo_stack/s12gauge/prefilled = 3,
22+
/obj/item/ammo_box/magazine/ammo_stack/s12gauge/prefilled/flechette = 2,
23+
/obj/item/ammo_box/magazine/ammo_stack/s12gauge/prefilled/ecm = 3,
24+
/obj/item/ammo_box/magazine/ammo_stack/s12gauge/prefilled/slug = 3,
25+
/obj/item/ammo_box/magazine/ammo_stack/s12gauge/prefilled/ap_slug = 2,
26+
/obj/item/ammo_box/magazine/ammo_stack/c35_sol/prefilled = 3,
27+
/obj/item/ammo_box/magazine/ammo_stack/c35_sol/prefilled/tracer = 3,
28+
/obj/item/ammo_box/magazine/ammo_stack/c35_sol/prefilled/superfrag = 2,
29+
/obj/item/ammo_box/magazine/ammo_stack/c35_sol/prefilled/sabot = 2,
30+
/obj/item/ammo_box/magazine/ammo_stack/c40_sol/prefilled = 3,
31+
/obj/item/ammo_box/magazine/ammo_stack/c40_sol/prefilled/tracer = 3,
32+
/obj/item/ammo_box/magazine/ammo_stack/c40_sol/prefilled/hardcore = 2,
33+
/obj/item/ammo_box/magazine/ammo_stack/c310_strilka/prefilled = 3,
34+
/obj/item/ammo_box/magazine/ammo_stack/c310_strilka/prefilled/tracer = 3,
35+
/obj/item/ammo_box/magazine/ammo_stack/c310_strilka/prefilled/piercing = 2,
36+
/obj/item/ammo_box/magazine/ammo_stack/c310_strilka/prefilled/kedown = 2,
37+
/obj/item/ammo_box/magazine/ammo_stack/c585_trappiste/prefilled = 3,
38+
/obj/item/ammo_box/magazine/ammo_stack/c585_trappiste/prefilled/hollowpoint = 2,
39+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled = 1,
40+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/aphe = 1,
41+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/thermobaric = 1,
42+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/shrapnel = 2,
43+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/ecm = 2,
44+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/flechette = 2,
45+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/phosphor = 1,
46+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/sabot = 1,
47+
/obj/item/ammo_box/magazine/ammo_stack/c980/prefilled/smoke = 2,
48+
)
49+
50+
// Magazines
51+
52+
/obj/effect/spawner/random/epic_loot/magazines
53+
name = "random magazines"
54+
icon_state = "random_medpen_spawner"
55+
loot = list(
56+
/obj/item/ammo_box/magazine/miecz = 2,
57+
/obj/item/ammo_box/magazine/c12chinmoku = 2,
58+
/obj/item/ammo_box/magazine/c12chinmoku/standard = 1,
59+
/obj/item/ammo_box/magazine/karim = 2,
60+
/obj/item/ammo_box/magazine/c8marsian = 2,
61+
/obj/item/ammo_box/magazine/recharge/plasma_battery = 2,
62+
/obj/item/ammo_box/magazine/c12nomi = 2,
63+
/obj/item/ammo_box/magazine/c35sol_pistol = 2,
64+
/obj/item/ammo_box/magazine/c35sol_pistol/stendo = 1,
65+
/obj/item/ammo_box/magazine/c40sol_rifle = 2,
66+
/obj/item/ammo_box/magazine/c40sol_rifle/standard = 1,
67+
/obj/item/ammo_box/magazine/lanca = 2,
68+
/obj/item/ammo_box/magazine/c980_grenade/chill_out = 2,
69+
/obj/item/ammo_box/magazine/c980_grenade/drum/chill_out = 1,
70+
)
71+
72+
// The weapons themselves
73+
74+
/obj/effect/spawner/random/epic_loot/war
75+
name = "random weapons"
76+
icon = 'modular_lethal_doppler/epic_loot/icons/epic_loot.dmi'
77+
icon_state = "random_common_gun_blue"
78+
loot = list(
79+
/obj/item/gun/ballistic/revolver/shotgun_revolver = 3,
80+
/obj/item/gun/ballistic/automatic/xhihao_smg = 2,
81+
/obj/item/gun/ballistic/automatic/sol_rifle = 2,
82+
/obj/item/gun/ballistic/automatic/sol_rifle/evil = 2,
83+
/obj/item/gun/ballistic/revolver/sol = 3,
84+
/obj/item/gun/ballistic/marsian_super_rifle = 3,
85+
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman = 3,
86+
/obj/item/gun/ballistic/automatic/karim = 1,
87+
/obj/item/gun/ballistic/automatic/sol_grenade_launcher = 1,
88+
/obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil = 1,
89+
/obj/item/gun/ballistic/automatic/lanca = 1,
90+
/obj/item/gun/ballistic/automatic/pistol/sol = 3,
91+
/obj/item/gun/ballistic/automatic/pistol/sol/evil = 3,
92+
/obj/item/gun/ballistic/automatic/miecz = 2,
93+
/obj/item/gun/ballistic/automatic/nomi_shotgun = 1,
94+
/obj/item/gun/ballistic/rifle/osako = 2,
95+
/obj/item/gun/ballistic/rifle/osako/scoped = 2,
96+
/obj/item/gun/ballistic/automatic/sol_rifle/machinegun = 1,
97+
/obj/item/gun/ballistic/shotgun/ramu = 2,
98+
/obj/item/gun/ballistic/automatic/suppressed_rifle/marksman = 1,
99+
/obj/item/gun/ballistic/shotgun/riot/sol = 2,
100+
/obj/item/gun/ballistic/shotgun/riot/sol/evil = 2,
101+
/obj/item/gun/ballistic/automatic/seiba_smg = 2,
102+
/obj/item/gun/ballistic/automatic/sol_smg = 2,
103+
/obj/item/gun/ballistic/automatic/pistol/trappiste = 2,
104+
/obj/item/gun/ballistic/automatic/smartgun = 2,
105+
/obj/item/gun/ballistic/revolver/takbok = 2,
106+
/obj/item/gun/ballistic/automatic/suppressed_rifle = 1,
107+
/obj/item/gun/ballistic/automatic/pistol/weevil = 2,
108+
)
109+
110+
// Got a present for ya
111+
112+
/obj/effect/spawner/random/epic_loot/random_keycard
113+
name = "random keycard"
114+
icon = 'modular_lethal_doppler/epic_loot/icons/epic_loot.dmi'
115+
icon_state = "keycard_random"
116+
loot = list(
117+
/obj/item/keycard/epic_loot/green = 2,
118+
/obj/item/keycard/epic_loot/teal = 2,
119+
/obj/item/keycard/epic_loot/blue = 2,
120+
/obj/item/keycard/epic_loot/ourple = 2,
121+
/obj/item/keycard/epic_loot/red = 2,
122+
/obj/item/keycard/epic_loot/orange = 2,
123+
/obj/item/keycard/epic_loot/yellow = 2,
124+
/obj/item/keycard/epic_loot/black = 1,
125+
)
126+
127+
// Military loot revised
128+
129+
/obj/effect/spawner/random/epic_loot/random_explosives
130+
name = "random explosives"
131+
icon_state = "random_loot_military"
132+
loot = list(
133+
/obj/item/grenade/syndieminibomb/concussion/impact = 1,
134+
/obj/item/grenade/syndieminibomb/concussion = 2,
135+
/obj/item/grenade/syndieminibomb = 2,
136+
/obj/item/grenade/frag/impact = 1,
137+
/obj/item/grenade/frag = 2,
138+
/obj/item/grenade/stingbang = 2,
139+
/obj/item/grenade/smokebomb = 2,
140+
/obj/item/grenade/flashbang = 1,
141+
)
142+
143+
// Military loot revised
144+
145+
/obj/effect/spawner/random/epic_loot/random_other_military_loot
146+
name = "random military loot"
147+
icon_state = "random_loot_military"
148+
loot = list(
149+
/obj/item/clothing/mask/gas/sechailer = 4,
150+
/obj/item/clothing/mask/gas = 3,
151+
/obj/item/clothing/mask/gas/atmos/frontier_colonist = 3,
152+
/obj/item/folder/ancient_paperwork = 3,
153+
/obj/item/epic_loot/intel_folder = 4,
154+
/obj/item/epic_loot/slim_diary = 4,
155+
/obj/item/epic_loot/ssd = 3,
156+
/obj/item/epic_loot/hdd = 3,
157+
/obj/item/epic_loot/military_flash = 3,
158+
/obj/item/computer_disk/maintenance = 3,
159+
/obj/item/computer_disk/black_market = 2,
160+
/obj/item/epic_loot/plasma_explosive = 2,
161+
/obj/item/epic_loot/grenade_fuze = 4,
162+
/obj/item/epic_loot/signal_amp = 4,
163+
/obj/item/epic_loot/thermal_camera = 3,
164+
/obj/item/epic_loot/shuttle_gyro = 3,
165+
/obj/item/epic_loot/phased_array = 3,
166+
/obj/item/epic_loot/shuttle_battery = 3,
167+
/obj/item/epic_loot/military_circuit = 4,
168+
/obj/item/storage/epic_loot_medpen_case = 3,
169+
/obj/item/storage/epic_loot_docs_case = 3,
170+
/obj/item/storage/epic_loot_org_pouch = 3,
171+
// Armor land
172+
/obj/item/clothing/suit/armor/lethal_paper = 4,
173+
/obj/item/clothing/suit/armor/sf_peacekeeper = 4,
174+
/obj/item/clothing/suit/armor/sf_peacekeeper/debranded = 4,
175+
/obj/item/clothing/head/helmet/sf_peacekeeper = 4,
176+
/obj/item/clothing/head/helmet/sf_peacekeeper/debranded = 4,
177+
/obj/item/clothing/suit/armor/sf_hardened = 3,
178+
/obj/item/clothing/head/helmet/toggleable/sf_hardened = 3,
179+
/obj/item/clothing/suit/armor/sf_hardened/emt = 3,
180+
/obj/item/clothing/head/helmet/toggleable/sf_hardened/emt = 3,
181+
/obj/item/clothing/suit/armor/lethal_koranda = 2,
182+
/obj/item/clothing/suit/armor/lethal_kora_kulon = 2,
183+
/obj/item/clothing/head/helmet/lethal_kulon_helmet = 2,
184+
/obj/item/clothing/head/helmet/lethal_kulon_helmet/spawns_with_shield = 1,
185+
/obj/item/clothing/suit/armor/lethal_kora_kulon/full_set = 1,
186+
/obj/item/clothing/suit/armor/sf_sacrificial = 1,
187+
/obj/item/clothing/head/helmet/sf_sacrificial = 1,
188+
/obj/item/clothing/head/helmet/sf_sacrificial/spawns_with_shield = 0.5,
189+
/obj/item/clothing/suit/armor/lethal_slick = 0.5,
190+
/obj/item/clothing/head/helmet/lethal_larp_helmet = 0.5,
191+
)

‎modular_lethal_doppler/paxilweapons_real/code/ammo_stacks/tydhouer_980.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
caliber = CALIBER_980TYDHOUER
6969
max_ammo = 4
7070

71+
/obj/item/ammo_box/magazine/c980_grenade/chill_out
72+
ammo_type = /obj/item/ammo_casing/c980grenade/flechette
73+
7174
/obj/item/ammo_box/magazine/c980_grenade/starts_empty
7275
start_empty = TRUE
7376

@@ -78,5 +81,8 @@
7881
w_class = WEIGHT_CLASS_NORMAL
7982
max_ammo = 6
8083

84+
/obj/item/ammo_box/magazine/c980_grenade/drum/chill_out
85+
ammo_type = /obj/item/ammo_casing/c980grenade/flechette
86+
8187
/obj/item/ammo_box/magazine/c980_grenade/drum/starts_empty
8288
start_empty = TRUE

‎modular_lethal_doppler/paxilweapons_real/code/guns/kiboko.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
w_class = WEIGHT_CLASS_BULKY
1818
weapon_weight = WEAPON_HEAVY
1919
slot_flags = ITEM_SLOT_BACK
20-
accepted_magazine_type = /obj/item/ammo_box/magazine/c980_grenade
20+
accepted_magazine_type = /obj/item/ammo_box/magazine/c980_grenade/chill_out
2121
fire_sound = 'modular_lethal_doppler/paxilweapons_real/sound/kiboko/grenade_launcher.ogg'
2222
can_suppress = FALSE
2323
burst_size = 1
@@ -88,7 +88,7 @@
8888
icon_state = "kiboko_evil"
8989
worn_icon_state = "kiboko_evil"
9090
inhand_icon_state = "kiboko_evil"
91-
spawn_magazine_type = /obj/item/ammo_box/magazine/c980_grenade/drum
91+
spawn_magazine_type = /obj/item/ammo_box/magazine/c980_grenade/drum/chill_out
9292

9393
/obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil/no_mag
9494
spawnwithmagazine = FALSE

‎tgstation.dme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7260,7 +7260,9 @@
72607260
#include "modular_lethal_doppler\deepmaint_stuff\code\resupply_doohickey_filtre.dm"
72617261
#include "modular_lethal_doppler\deepmaint_stuff\code\resupply_doohickey_pinata.dm"
72627262
#include "modular_lethal_doppler\deepmaint_stuff\code\stash.dm"
7263+
#include "modular_lethal_doppler\epic_loot\code\container_overrides.dm"
72637264
#include "modular_lethal_doppler\epic_loot\code\keycards.dm"
7265+
#include "modular_lethal_doppler\epic_loot\code\loot_spawns.dm"
72647266
#include "modular_lethal_doppler\item_visuals\code\random_rotation.dm"
72657267
#include "modular_lethal_doppler\ledge_grab\code\ledge_behavior.dm"
72667268
#include "modular_lethal_doppler\ledge_grab\code\living_z_level.dm"

0 commit comments

Comments
 (0)