cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some boxes starting with the wrong contents and more (#3247)

Browse Source 
-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:
Alberyk
2017-08-07 16:53:43 -03:00
committed by Erki
parent 3714736667
commit 0e5d79c13f
5 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/uplink/devices and tools.dm
View File

@@ -26,9 +26,9 @@
path = /obj/item/weapon/plastique path = /obj/item/weapon/plastique
/datum/uplink_item/item/tools/heavy_vest /datum/uplink_item/item/tools/heavy_vest
name = "Heavy Armor Vest" name = "Heavy Armor Kit"
item_cost = 4 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 /datum/uplink_item/item/tools/encryptionkey_radio
name = "Encrypted Radio Channel Key" name = "Encrypted Radio Channel Key"

22
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -158,22 +158,22 @@
desc = "A box full of syringes." desc = "A box full of syringes."
icon_state = "syringe" 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 )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src ) new /obj/item/weapon/reagent_containers/syringe( src )
/obj/item/weapon/storage/box/syringegun /obj/item/weapon/storage/box/syringegun
name = "box of syringe gun cartridges" name = "box of syringe gun cartridges"
desc = "A box full of compressed gas cartridges." desc = "A box full of compressed gas cartridges."
icon_state = "syringe" 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 )
new /obj/item/weapon/syringe_cartridge( src ) new /obj/item/weapon/syringe_cartridge( src )
@@ -638,7 +638,7 @@
desc = "A box full of zipties." desc = "A box full of zipties."
icon_state = "handcuff" 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)
new /obj/item/weapon/handcuffs/ziptie(src) new /obj/item/weapon/handcuffs/ziptie(src)

13
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -166,7 +166,7 @@
new /obj/item/device/spy_monitor(src) new /obj/item/device/spy_monitor(src)
/obj/item/weapon/storage/box/syndie_kit/g9mm /obj/item/weapon/storage/box/syndie_kit/g9mm
name = "\improper Smooth operator" name = "smooth operator"
desc = "9mm with silencer kit." desc = "9mm with silencer kit."
/obj/item/weapon/storage/box/syndie_kit/g9mm/fill() /obj/item/weapon/storage/box/syndie_kit/g9mm/fill()
@@ -184,7 +184,7 @@
new /obj/item/weapon/reagent_containers/syringe(src) new /obj/item/weapon/reagent_containers/syringe(src)
/obj/item/weapon/storage/box/syndie_kit/cigarette /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." 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() /obj/item/weapon/storage/box/syndie_kit/cigarette/fill()
@@ -225,7 +225,7 @@
C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots) C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots)
/obj/item/weapon/storage/box/syndie_kit/ewar_voice /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." desc = "Kit for confounding organic and synthetic entities alike."
/obj/item/weapon/storage/box/syndie_kit/ewar_voice/fill() /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/electrowarfare_suite(src)
new /obj/item/rig_module/voice(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 /obj/item/weapon/storage/secure/briefcase/money
name = "suspicious briefcase" name = "suspicious briefcase"

2
code/modules/clothing/spacesuits/rig/modules/combat.dm
View File

@@ -184,7 +184,7 @@
interface_name = "mounted pulse rifle" interface_name = "mounted pulse rifle"
interface_desc = "A shoulder-mounted cell-powered 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 /obj/item/rig_module/mounted/smg

2
code/modules/projectiles/gun.dm
View File

@@ -94,6 +94,8 @@
if(isnull(scoped_accuracy)) if(isnull(scoped_accuracy))
scoped_accuracy = accuracy scoped_accuracy = accuracy
queue_icon_update()
//Checks whether a given mob can use the gun //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. //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. //Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there.