Skip to content

Commit 7e4c732

Browse files
authored
. (#1052)
1 parent 0d8f61f commit 7e4c732

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

+1-5
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,13 @@
8282
new /obj/item/defibrillator/compact/loaded(src)
8383
new /obj/item/assembly/flash/handheld(src)
8484
new /obj/item/reagent_containers/hypospray/cmo(src)
85-
new /obj/item/autosurgeon/organ/cmo(src)
86-
new /obj/item/clothing/neck/petcollar(src)
87-
new /obj/item/pet_carrier(src)
8885
new /obj/item/wallframe/defib_mount(src)
8986
new /obj/item/circuitboard/machine/fabricator/department/medical(src)
9087
new /obj/item/storage/photo_album/cmo(src)
9188
new /obj/item/storage/lockbox/medal/med(src)
9289
new /obj/item/gun/ballistic/rifle/tranqrifle(src)
93-
new /obj/item/ammo_box/magazine/tranq_rifle(src)
9490
new /obj/item/ammo_box/magazine/tranq_rifle/ryetalyn(src)
95-
91+
new /obj/item/ammo_box/magazine/tranq_rifle/ryetalyn(src)
9692

9793
/obj/structure/closet/secure_closet/animal
9894
name = "animal control"

code/modules/clothing/suits/labcoat.dm

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
/obj/item/reagent_containers/hypospray,
1818
/obj/item/reagent_containers/pill,
1919
/obj/item/reagent_containers/syringe,
20-
/obj/item/gun/syringe,
2120
/obj/item/sensor_device,
2221
/obj/item/soap,
2322
/obj/item/stack/medical,

code/modules/projectiles/guns/special/tranq_rifle.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
custom_materials = list(/datum/material/iron=2000)
1414
clumsy_check = FALSE
1515
fire_sound = 'sound/items/syringeproj.ogg'
16-
mag_type = /obj/item/ammo_box/magazine/tranq_rifle
16+
mag_type = /obj/item/ammo_box/magazine/tranq_rifle/ryetalyn
1717
internal_magazine = FALSE
1818
empty_alarm = FALSE
1919
hidden_chambered = TRUE

0 commit comments

Comments
 (0)