Skip to content

Commit

Permalink
feat: add SSLR as roundstart magazine-based rifle (#1293)
Browse files Browse the repository at this point in the history 
## Что этот PR делает

По просьбе Wycc добавляем щиткурам лазерную винтовку с магазинными
заряжанием.
Магазин на 8 патронов, прожетайл такой же как и у других лазерок.
Магазины можно печатать в РнД сразу же, так же можно заказать коробку с
4 патронами за 150 кредитов в карго.

Спрайты от EllGood

## Почему это хорошо для игры

Разнообразние

## Изображения изменений


![image](https://github.com/ss220club/Paradise-SS220/assets/44334376/3e548925-8fa1-4b0c-b56a-604c07096ffe)

![image](https://github.com/ss220club/Paradise-SS220/assets/44334376/997003e8-19a4-4628-935e-c1b3fe54f62b)

![image](https://github.com/ss220club/Paradise-SS220/assets/44334376/c2c5e7b7-7928-4605-adf6-8eecd142dbbe)



## Тестирование

Всё потестировал

## Changelog

:cl:
add: Добавлена лазерная винтовка с магазинным заряжанием раундстартом у
СБ.
/:cl:

---------

Co-authored-by: Aylong <[email protected]>
  • Loading branch information
@Gaxeer @AyIong
Gaxeer and AyIong authored Jun 7, 2024
1 parent 31c9f3c commit 7c8b5d1
Show file tree
Hide file tree
Showing 9 changed files with 350 additions and 112 deletions.
144 changes: 103 additions & 41 deletions _maps/map_files220/stations/boxstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,10 +852,10 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
/obj/machinery/hologram/holopad,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -903,15 +903,27 @@
/turf/simulated/floor/plasteel,
/area/station/security/prisonershuttle)
"afe" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
/obj/structure/window/reinforced,
/obj/structure/rack/gunrack,
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=Armory_South";
location = "Armory_North"
/obj/item/gun/energy/disabler{
pixel_x = -8
},
/obj/item/gun/energy/disabler{
pixel_x = -4
},
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler{
pixel_x = 4
},
/obj/item/gun/energy/disabler{
pixel_x = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 8;
icon_state = "vault"
},
/area/station/security/armory/secure)
"afk" = (
Expand Down Expand Up @@ -1477,18 +1489,12 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/gun/energy/laser{
pixel_x = 8
},
/obj/item/gun/energy/laser{
pixel_x = 4
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
pixel_x = -4
},
/obj/item/gun/energy/laser,
/obj/item/gun/energy/laser{
pixel_x = -8
pixel_x = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -1575,18 +1581,12 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/gun/energy/gun{
pixel_x = 8
},
/obj/item/gun/energy/gun{
pixel_x = 4
},
/obj/item/gun/energy/gun,
/obj/item/gun/energy/gun{
pixel_x = -4
},
/obj/item/gun/energy/gun,
/obj/item/gun/energy/gun{
pixel_x = -8
pixel_x = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -1740,7 +1740,6 @@
/area/station/security/brig)
"ajq" = (
/obj/structure/rack,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
Expand Down Expand Up @@ -1769,22 +1768,18 @@
/area/station/security/armory/secure)
"ajr" = (
/obj/structure/rack/gunrack,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/gun/energy/disabler{
pixel_x = 8
/obj/item/gun/projectile/automatic/sslr{
pixel_x = -4
},
/obj/item/gun/energy/disabler{
/obj/item/gun/projectile/automatic/sslr,
/obj/item/gun/projectile/automatic/sslr{
pixel_x = 4
},
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler{
pixel_x = -4
/obj/item/gun/projectile/automatic/sslr{
pixel_x = 8
},
/obj/item/gun/energy/disabler{
pixel_x = -8
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -1893,6 +1888,9 @@
d2 = 8;
icon_state = "1-8"
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -1990,14 +1988,14 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -2193,6 +2191,9 @@
icon_state = "4-8"
},
/obj/machinery/light_switch/south,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -45610,6 +45611,13 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=Armory_South";
location = "Armory_North"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -53730,6 +53738,57 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/fsmaint)
"guL" = (
/obj/structure/window/reinforced,
/obj/structure/rack,
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 12;
pixel_x = -4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 12
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 12;
pixel_x = 4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 8;
pixel_x = -4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 8
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 8;
pixel_x = 4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 4;
pixel_x = -4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 4
},
/obj/item/ammo_box/magazine/sslr{
pixel_y = 4;
pixel_x = 4
},
/obj/item/ammo_box/magazine/sslr{
pixel_x = -4
},
/obj/item/ammo_box/magazine/sslr,
/obj/item/ammo_box/magazine/sslr{
pixel_x = 4
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/station/security/armory/secure)
"guQ" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/condiment/saltshaker,
Expand Down Expand Up @@ -65036,6 +65095,9 @@
name = "Secure Armory Shutter Control";
req_one_access_txt = "3"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -133934,7 +133996,7 @@ ahV
aiq
aiN
ajr
ajj
guL
kAr
aiv
amG
Expand Down
Loading

0 comments on commit 7c8b5d1

Please sign in to comment.