mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 08:01:06 +00:00
Fixes some boxes starting with the wrong contents and more (#3247)
-fixes #3226 -fixes zipties boxes -fixes the mounted pulse module using the wrong gun -fixes ballistic guns icons showing as empty when the round starts -tweaks the uplink vest to include the matching helmet
This commit is contained in:
@@ -26,9 +26,9 @@
|
||||
path = /obj/item/weapon/plastique
|
||||
|
||||
/datum/uplink_item/item/tools/heavy_vest
|
||||
name = "Heavy Armor Vest"
|
||||
name = "Heavy Armor Kit"
|
||||
item_cost = 4
|
||||
path = /obj/item/clothing/suit/storage/vest/merc
|
||||
path = /obj/item/weapon/storage/box/syndie_kit/armor
|
||||
|
||||
/datum/uplink_item/item/tools/encryptionkey_radio
|
||||
name = "Encrypted Radio Channel Key"
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
desc = "A box full of syringes."
|
||||
icon_state = "syringe"
|
||||
|
||||
New()
|
||||
/obj/item/weapon/storage/box/syringes/fill()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/syringe( src )
|
||||
new /obj/item/weapon/reagent_containers/syringe( src )
|
||||
@@ -173,7 +173,7 @@
|
||||
desc = "A box full of compressed gas cartridges."
|
||||
icon_state = "syringe"
|
||||
|
||||
/obj/item/weapon/storage/box/syringes/fill()
|
||||
/obj/item/weapon/storage/box/syringegun/fill()
|
||||
..()
|
||||
new /obj/item/weapon/syringe_cartridge( src )
|
||||
new /obj/item/weapon/syringe_cartridge( src )
|
||||
@@ -638,7 +638,7 @@
|
||||
desc = "A box full of zipties."
|
||||
icon_state = "handcuff"
|
||||
|
||||
/obj/item/weapon/storage/box/handcuffs/fill()
|
||||
/obj/item/weapon/storage/box/zipties/fill()
|
||||
..()
|
||||
new /obj/item/weapon/handcuffs/ziptie(src)
|
||||
new /obj/item/weapon/handcuffs/ziptie(src)
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
new /obj/item/device/spy_monitor(src)
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/g9mm
|
||||
name = "\improper Smooth operator"
|
||||
name = "smooth operator"
|
||||
desc = "9mm with silencer kit."
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/g9mm/fill()
|
||||
@@ -184,7 +184,7 @@
|
||||
new /obj/item/weapon/reagent_containers/syringe(src)
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/cigarette
|
||||
name = "\improper Tricky smokes"
|
||||
name = "tricky smokes"
|
||||
desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up."
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/cigarette/fill()
|
||||
@@ -225,7 +225,7 @@
|
||||
C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots)
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/ewar_voice
|
||||
name = "Electrowarfare and Voice Synthesiser kit"
|
||||
name = "electrowarfare and voice synthesiser kit"
|
||||
desc = "Kit for confounding organic and synthetic entities alike."
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/ewar_voice/fill()
|
||||
@@ -233,6 +233,13 @@
|
||||
new /obj/item/rig_module/electrowarfare_suite(src)
|
||||
new /obj/item/rig_module/voice(src)
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/armor
|
||||
name = "boxed armor kit"
|
||||
|
||||
/obj/item/weapon/storage/box/syndie_kit/armor/fill()
|
||||
..()
|
||||
new /obj/item/clothing/suit/storage/vest/merc(src)
|
||||
new /obj/item/clothing/head/helmet/merc(src)
|
||||
|
||||
/obj/item/weapon/storage/secure/briefcase/money
|
||||
name = "suspicious briefcase"
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
interface_name = "mounted pulse rifle"
|
||||
interface_desc = "A shoulder-mounted cell-powered pulse rifle."
|
||||
|
||||
gun_type = /obj/item/weapon/gun/energy/pulse
|
||||
gun_type = /obj/item/weapon/gun/energy/pulse/mounted
|
||||
|
||||
/obj/item/rig_module/mounted/smg
|
||||
|
||||
|
||||
@@ -94,6 +94,8 @@
|
||||
if(isnull(scoped_accuracy))
|
||||
scoped_accuracy = accuracy
|
||||
|
||||
queue_icon_update()
|
||||
|
||||
//Checks whether a given mob can use the gun
|
||||
//Any checks that shouldn't result in handle_click_empty() being called if they fail should go here.
|
||||
//Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there.
|
||||
|
||||
Reference in New Issue
Block a user