Skip to content

Commit

Permalink
Feat: Expeditors (gaters) fast start (#382)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
- Добавляет ящик гейтеров (спрайт Эйлонга), в котором лежит гейтган
(МК1, за МК2 - на стойку РНД), аптечка первой помощи и инструкция
- Добавляет motion-sensetive камеру в комнату гейтеров по аналогии с
Евой
 - Немного изменяет визуал комнаты
 - Гейтган имеет 50% шанс взорваться при емаге
 - Ящик с имплантами изгнания перемещен в Еву

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

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

![image](https://github.com/ss220club/Paradise-SS220/assets/20109643/1551238a-797d-484e-a4ac-0ba63403f25f)

## Тестирование
Проверял в игре

## Changelog

:cl:
add: Кибериада: Добавил ящик гейтеров, в котором лежит гейтган (МК1, за
МК2 - на стойку РНД), аптечка первой помощи и инструкция
add: Кибериада: Добавляет motion-sensetive камеру в комнату гейтеров по
аналогии с Евой
tweak: Кибериада: Немного изменил визуал комнаты гейтеров
tweak: Ящик с имплантами изгнания перемещен в Еву
tweak: Теперь гейтган имеет 50% шанс взорваться при емаге
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
dj-34 authored Oct 9, 2023
1 parent a6d5b33 commit 62d8c7a
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 40 deletions.
68 changes: 36 additions & 32 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12554,8 +12554,9 @@
/area/station/public/dorms)
"aVr" = (
/obj/machinery/gateway,
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "vault"
},
/area/station/service/expedition)
"aVs" = (
Expand Down Expand Up @@ -15732,17 +15733,19 @@
/obj/machinery/gateway{
dir = 10
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "vault"
},
/area/station/service/expedition)
"bgL" = (
/obj/machinery/light/directional/east,
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
icon_state = "vault"
},
/area/station/service/expedition)
"bgM" = (
Expand Down Expand Up @@ -15943,7 +15946,6 @@
},
/area/station/service/expedition)
"bhI" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "stairs-r"
},
Expand Down Expand Up @@ -16668,7 +16670,6 @@
dir = 5
},
/obj/machinery/alarm/directional/west,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkbluecorners"
Expand Down Expand Up @@ -16908,7 +16909,6 @@
/obj/structure/railing/cap{
dir = 1
},
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbluecorners"
Expand Down Expand Up @@ -33957,6 +33957,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand All @@ -33974,12 +33975,11 @@
},
/area/station/engineering/control)
"cGV" = (
/obj/structure/closet/secure_closet/exile,
/obj/effect/decal/warning_stripes/white/hollow,
/obj/effect/decal/warning_stripes/northeast,
/obj/item/radio/intercom/directional/west,
/obj/structure/closet/secure_closet/expedition,
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 5;
icon_state = "darkblue"
},
/area/station/service/expedition)
"cGW" = (
Expand Down Expand Up @@ -34012,6 +34012,7 @@
dir = 4
},
/obj/machinery/hologram/holopad,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -35625,6 +35626,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -39262,11 +39264,14 @@
},
/area/station/engineering/gravitygenerator)
"cYN" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/warning_stripes/white/hollow,
/obj/effect/decal/warning_stripes/east,
/obj/structure/closet/secure_closet/expedition,
/obj/machinery/camera/motion{
c_tag = "Gateway Motion Sensor";
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 4;
icon_state = "darkblue"
},
/area/station/service/expedition)
"cYO" = (
Expand Down Expand Up @@ -39339,18 +39344,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"cZa" = (
/obj/structure/table,
/obj/machinery/power/apc/directional/east,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/item/storage/firstaid/regular{
pixel_y = 2
},
/obj/machinery/light_switch/south,
/obj/structure/closet/secure_closet/expedition,
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 8;
icon_state = "darkblue"
},
/area/station/service/expedition)
"cZb" = (
Expand Down Expand Up @@ -39701,20 +39704,13 @@
},
/area/station/engineering/hallway)
"daf" = (
/obj/structure/table/reinforced,
/obj/machinery/requests_console{
department = "EVA";
name = "EVA Requests Console";
pixel_x = -32
},
/obj/effect/decal/warning_stripes/white/hollow,
/obj/item/paper/pamphlet/gateway{
pixel_x = -4
},
/obj/item/paper/pamphlet/gateway,
/obj/item/paper/pamphlet/gateway{
pixel_x = 4
},
/obj/structure/closet/secure_closet/exile,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -46729,7 +46725,6 @@
},
/area/station/maintenance/apmaint)
"efl" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "stairs-m"
},
Expand Down Expand Up @@ -72519,6 +72514,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -79804,8 +79800,10 @@
name = "Gateway Shutters Control";
req_one_access_txt = "62"
},
/obj/structure/closet/secure_closet/expedition,
/turf/simulated/floor/plasteel{
icon_state = "dark"
dir = 9;
icon_state = "darkblue"
},
/area/station/service/expedition)
"qvO" = (
Expand Down Expand Up @@ -82678,6 +82676,12 @@
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
"rBx" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/service/expedition)
"rBN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -93055,7 +93059,6 @@
},
/area/station/engineering/atmos)
"vtO" = (
/obj/effect/landmark/start/explorer,
/turf/simulated/floor/plasteel{
icon_state = "stairs-l"
},
Expand Down Expand Up @@ -99255,6 +99258,7 @@
/turf/space,
/area/space/nearstation)
"xKc" = (
/obj/effect/turf_decal/caution,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkblue"
Expand Down Expand Up @@ -125178,7 +125182,7 @@ bgK
vtO
bam
cGT
aUF
rBx
iIt
bgP
pBf
Expand Down Expand Up @@ -125435,7 +125439,7 @@ aVr
efl
xKc
cGZ
aUF
rBx
iIt
bgP
pBf
Expand Down
26 changes: 18 additions & 8 deletions modular_ss220/awaymission_gun/code/items/awaymission_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,28 @@
selfcharge = FALSE
update_icon()

/obj/item/gun/energy/laser/awaymission_aeg/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)

/obj/item/gun/energy/laser/awaymission_aeg/emag_act(mob/user)
. = ..()
if (emagged)
if(emagged)
return

if(user)
user.visible_message(span_warning("От [name] летят искры!"), span_notice("Вы взломали [name], что привело к перезаписи протоколов безопасности. Устройство может быть использовано вне ограничений"))
playsound(loc, 'sound/effects/sparks4.ogg', 30, 1)
do_sparks(5, 1, src)

emagged = TRUE
selfcharge = TRUE
if(prob(50))
user.visible_message(span_warning("От [name] летят искры!"), span_notice("Вы взломали [name], что привело к перезаписи протоколов безопасности. Устройство может быть использовано вне ограничений"))
playsound(loc, 'sound/effects/sparks4.ogg', 30, 1)
do_sparks(5, 1, src)
emagged = TRUE
selfcharge = TRUE
else
user.visible_message(span_warning("От [name] летят искры... Он сейчас взорвётся!"), span_notice("Ой... Что-то пошло не так!"))
do_sparks(5, 1, src)
update_mob()
explosion(loc, -1, 0, 2)
qdel(src)

/obj/item/gun/energy/laser/awaymission_aeg/emp_act(severity)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/objects/_objects.dme
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "_objects.dm"

#include "code/closets.dm"
#include "code/miscellaneous.dm"
#include "code/officetoys.dm"
#include "code/papershredder.dm"
Expand Down
12 changes: 12 additions & 0 deletions modular_ss220/objects/code/closets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/structure/closet/secure_closet/expedition
name = "expeditors locker"
req_access = list(ACCESS_EXPEDITION)
icon = 'modular_ss220/objects/icons/closets.dmi'
icon_state = "explorer"
icon_opened = "explorer_open"
open_door_sprite = "explorer_door"

/obj/structure/closet/secure_closet/expedition/populate_contents()
new /obj/item/gun/energy/laser/awaymission_aeg/rnd(src)
new /obj/item/storage/firstaid/regular(src)
new /obj/item/paper/pamphlet/gateway(src)
Binary file added modular_ss220/objects/icons/closets.dmi
Binary file not shown.

0 comments on commit 62d8c7a

Please sign in to comment.