Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix airlock red circle triangle exclaimnation mark icon #1335

Closed
wants to merge 11 commits into from
Closed

Fix airlock red circle triangle exclaimnation mark icon #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6d132c8
[MIRROR] Fix parrot drop message visible to observers
SuhEugene Nov 3, 2023
9a23bf1
Make saferooms area datum better
SuhEugene Nov 3, 2023
54aaf05
Remove medbay botany sign
SuhEugene Nov 3, 2023
ca885e1
Add saferooms ability to bolt and unbolt
SuhEugene Nov 3, 2023
1a5311f
Remove unecessary logging
SuhEugene Nov 3, 2023
0c52da7
Чейнджлог для PR #1325 [ci skip]
SierraHelper Nov 3, 2023
2024570
Fix UTF-8 browser charset
SuhEugene Nov 3, 2023
856813d
Fix Pioneer Corps spawnpoint (#1312)
LordNest Nov 3, 2023
73d8457
Чейнджлог для PR #1332 [ci skip]
SierraHelper Nov 3, 2023
b2329c4
Чейнджлог для PR #1312 [ci skip]
SierraHelper Nov 3, 2023
a2418b0
Fix airlock red circle triangle exclaimnation mark icon
SuhEugene Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/browser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

return {"<!DOCTYPE html>
<html>
<meta charset=UTF-8">
<meta charset="UTF-8">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
[head_content]
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/doors/door.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@
operating = DOOR_OPERATING_YES

do_animate("opening")
icon_state = "door0"
set_opacity(0)
if(width > 1)
set_fillers_opacity(0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/retaliate/parrot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@
return -1

if(!held_item)
to_chat(usr, SPAN_WARNING("You have nothing to drop!"))
to_chat(src, SPAN_WARNING("You have nothing to drop!"))
return 0

if(!drop_gently)
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-sierra-pr-1312.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: LordNest
changes:
- {bugfix: 'Пофиксил спавнпоинты пионеров, сержанта и инженера Пионерского Корпуса'}
delete-after: true
6 changes: 6 additions & 0 deletions html/changelogs/AutoChangeLog-sierra-pr-1325.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: SuhEugene
changes:
- {bugfix: 'Убрал логирование, которое возможно сильно нагружает сервер.'}
- {bugfix: Сделал бункеры рабочими.}
- {maptweak: Удалил табличку ботаники из меда.}
delete-after: true
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-sierra-pr-1332.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: SuhEugene
changes:
- {bugfix: Починил кодировку тикет-панели (в очередной раз).}
delete-after: true
2 changes: 0 additions & 2 deletions maps/sierra/areas/z3_sierra_deck2.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@

/area/crew_quarters/safe_room/seconddeck
name = "Second Deck - Safe Room"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/area/maintenance/substation/seconddeck
name = "Second Deck - Substation"
Expand Down
4 changes: 1 addition & 3 deletions maps/sierra/areas/z4_sierra_deck1.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,8 @@
name = "First Deck - Living - Library"
holomap_color = HOLOMAP_AREACOLOR_CREW

/area/crew_quarters/safe_room
/area/crew_quarters/safe_room/firstdeck
name = "First Deck - Citadel"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/* SECURITY AREAS
* ==============
Expand Down
1 change: 0 additions & 1 deletion maps/sierra/areas/z5_sierra_bridge.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@

/area/crew_quarters/safe_room/bridge
name = "Bridge - Safe Room"
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/area/crew_quarters/heads/office/rd/cobed
icon_state = "heads_rd"
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/sierra_areas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
icon_state = "thruster"
req_access = list(access_engine)

/area/crew_quarters/safe_room
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

#include "areas/shuttles.dm"
#include "areas/z1_sierra_deck4.dm"
#include "areas/z2_sierra_deck3.dm"
Expand Down
16 changes: 16 additions & 0 deletions maps/sierra/sierra_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,19 @@
to_chat(Player, "<font color='red'><b>Вы не пережили события на [station_name()]...</b></font>")
else
to_chat(Player, "<font color='red'><b>Вы не пережили события на [station_name()]...</b></font>")

/datum/map/bolt_saferooms()
for(var/atype in typesof(/area/crew_quarters/safe_room))
var/area/A = locate(atype)
if(istype(A))
for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
if(!V.locked)
V.lock()

/datum/map/unbolt_saferooms()
for(var/atype in typesof(/area/crew_quarters/safe_room))
var/area/A = locate(atype)
if(istype(A))
for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
if(V.locked)
V.unlock()
Loading