Skip to content

Commit

Permalink
ионку фиксим
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest committed Feb 17, 2024
1 parent 294c731 commit fa84d76
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion maps/sierra/structures/closets/armory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/obj/structure/closet/secure_closet/guncabinet/sierra_armory/ion/WillContain()
return list(/obj/item/gun/energy/ionrifle = 2,
/obj/item/gun/energy/ionrifle/small = 1)
/obj/item/gun/energy/ionrifle/small/sec = 1)

/obj/structure/closet/secure_closet/guncabinet/sierra_armory/egun
name = "energy guncabinet"
Expand Down
2 changes: 1 addition & 1 deletion maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -49435,7 +49435,7 @@
/obj/structure/closet/secure_closet/guncabinet,
/obj/item/barrier,
/obj/item/storage/toolbox/mechanical,
/obj/item/gun/energy/ionrifle/small,
/obj/item/gun/energy/ionrifle/small/sec,
/obj/item/gun/energy/gun,
/obj/item/clothing/suit/armor/captain,
/obj/item/clothing/gloves/captain,
Expand Down
9 changes: 9 additions & 0 deletions mods/guns/_guns.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,12 @@
#include "code/xenos.dm"

#endif
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
// END_INCLUDE
8 changes: 8 additions & 0 deletions mods/guns/code/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@

/obj/item/gun/energy/ionrifle
icon = 'mods/guns/icons/obj/ion_rifle.dmi'
item_icons = list(
slot_r_hand_str = 'mods/guns/icons/mob/righthand_guns.dmi',
slot_l_hand_str = 'mods/guns/icons/mob/lefthand_guns.dmi',
)

/obj/item/gun/energy/ionrifle/small
wielded_item_state = null

/obj/item/gun/energy/ionrifle/small/sec
desc = "The NT Mk72 EW Preston is a personal defense weapon designed to disable mechanical threats. This one clad in white frame."
Expand Down Expand Up @@ -56,4 +63,5 @@
name = "disorientator"
desc = "The W-T Mk. 6 Disorientator fitted with an NT1017 secure fire chip. It has a NanoTrasen logo on the grip."
icon = 'mods/guns/icons/obj/confuseray_secure.dmi'
icon_state = "confusesecure"
req_access = list(list(access_brig, access_bridge))
Binary file modified mods/guns/icons/mob/lefthand_guns.dmi
Binary file not shown.
Binary file modified mods/guns/icons/mob/righthand_guns.dmi
Binary file not shown.
Binary file modified mods/guns/icons/obj/confuseray_secure.dmi
Binary file not shown.

0 comments on commit fa84d76

Please sign in to comment.