Merge branch 'Bubberstation:master' into master

SPLURT-Station · Aug 30, 2024 · ceaaae8 · ceaaae8
2 parents 665b943 + 5c1eb9c
commit ceaaae8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-2018.yml b/html/changelogs/AutoChangeLog-pr-2018.yml
@@ -0,0 +1,4 @@
+author: "projectkepler-ru"
+delete-after: True
+changes:
+  - rscadd: "disabler smg to sec medic"
diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm
@@ -56,9 +56,7 @@
 	suit = /obj/item/clothing/suit/armor/vest/peacekeeper/security_medic
 	l_hand = /obj/item/storage/medkit/brute
 	head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
-/* 	backpack_contents = list(
-		/obj/item/storage/box/gunset/firefly = 1, // FIX THIS LATER
-		) */
+	suit_store = /obj/item/gun/energy/disabler/smg
 	backpack = /obj/item/storage/backpack/security
 	satchel = /obj/item/storage/backpack/satchel/sec
 	duffelbag = /obj/item/storage/backpack/duffelbag/sec