Skip to content

Commit

Permalink
Merge pull request #815 from VastKilleroOm/Fixes-revolvers
Browse files Browse the repository at this point in the history
Фикс револьверов на картах
  • Loading branch information
molnizz committed Jul 10, 2024
2 parents cbe240c + 7d39f43 commit 5d71584
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3173,7 +3173,7 @@
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
/obj/item/ammo_box/a357,
/obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/wood,
/area/ship/bridge)
"VM" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/HoS/syndicate,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/pen/edagger,
/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"bJ" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3099,6 +3099,7 @@
/obj/item/gun/ballistic/derringer/traitor,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"El" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2848,13 +2848,13 @@
name = "captain's closet";
req_access_txt = "20"
},
/obj/item/gun/ballistic/revolver,
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/HoS/cybersun,
/obj/item/clothing/under/syndicate/cybersun/officer,
/obj/item/reagent_containers/food/drinks/flask,
/obj/item/reagent_containers/food/drinks/bottle/gin,
/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/carpet/cyan,
/area/ship/bridge)
"Xi" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,6 @@
/obj/item/codespeak_manual{
charges = 2
},
/obj/item/gun/ballistic/revolver,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
},
Expand All @@ -1807,6 +1806,7 @@
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/gun/ballistic/revolver/syndicate,
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"ky" = (
Expand Down

0 comments on commit 5d71584

Please sign in to comment.