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.

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

Almayer Renovation #8291

Draft
wants to merge 67 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
ad60d84
almayer
Syndro101 Jan 28, 2025
5b9fd90
ditto
Syndro101 Jan 28, 2025
98d7920
lower deck cryo bay stuff
Syndro101 Jan 28, 2025
5c3f36b
Merge branch 'cmss13-devs:master' into Almayer_Renovation
Syndro101 Jan 28, 2025
0ad726f
fixes
Syndro101 Jan 29, 2025
da7a4b8
Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMS…
Syndro101 Jan 29, 2025
0c384c3
Merge branch 'cmss13-devs:master' into Almayer_Renovation
Syndro101 Jan 29, 2025
6d2d261
fixes some disposal pipes
Syndro101 Jan 30, 2025
4bf6acc
new reporter office
Syndro101 Jan 30, 2025
ea1ad83
small fixes
Syndro101 Jan 30, 2025
9e1b4b0
removal of some redundant walls
Syndro101 Jan 30, 2025
6da3ab4
CBRN closet for the new room in engineering
Syndro101 Jan 30, 2025
2343f07
small fixes
Syndro101 Jan 30, 2025
1ef49af
small whoopsie
Syndro101 Jan 30, 2025
4469203
removed 1 mopp suit for balance
Syndro101 Jan 30, 2025
f46fd7e
air pipe
Syndro101 Jan 30, 2025
c935477
Locks 2 CBRN suits behind CO only access
Syndro101 Jan 30, 2025
c95804b
added decon showers to cbrn room as fluff
Syndro101 Jan 30, 2025
641288b
Merge branch 'cmss13-devs:master' into Almayer_Renovation
Syndro101 Jan 30, 2025
26058dc
minor changes to the CBRN closet
Syndro101 Jan 30, 2025
4a088c4
Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMS…
Syndro101 Jan 30, 2025
08c63cb
We have a basic med helmet visor, why not glasses? Adds one to the CB…
Syndro101 Jan 30, 2025
1e530b9
changes
Syndro101 Jan 30, 2025
e6f8090
Merge branch 'cmss13-devs:master' into Almayer_Renovation
Syndro101 Jan 30, 2025
dd118d4
fixes shifted apc hopefully
Syndro101 Jan 30, 2025
74a350c
Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMS…
Syndro101 Jan 30, 2025
b076a31
fixes angry varediting
Syndro101 Jan 30, 2025
b245a75
for real this time
Syndro101 Jan 30, 2025
34b0fec
Fixup maps in TGM format
Syndro101 Jan 30, 2025
f20e6d4
Merge branch 'master' into Almayer_Renovation
Syndro101 Jan 31, 2025
2cf1243
Merge branch 'master' into Almayer_Renovation
Syndro101 Jan 31, 2025
5d01067
CBRN closets are funky, removed for now and replaced with rad suits i…
Syndro101 Jan 31, 2025
85382ce
Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMS…
Syndro101 Jan 31, 2025
88ca54b
Merge branch 'master' into Almayer_Renovation
Syndro101 Jan 31, 2025
a0f2af0
merge conflict 1
Syndro101 Jan 31, 2025
8697911
merge conflict 2
Syndro101 Jan 31, 2025
33de5fa
sprite fix
Syndro101 Feb 5, 2025
ecf8aeb
merge conflict 1
Syndro101 Feb 5, 2025
c692a30
merge conflict 2
Syndro101 Feb 5, 2025
c9cdb53
Fixup maps in TGM format
Syndro101 Feb 5, 2025
18188ee
fixes apc, fixes missing area from merge
Syndro101 Feb 5, 2025
d6f8186
fixing merge conflict glitches
Syndro101 Feb 5, 2025
323ec9a
Merge branch 'master' into Almayer_Renovation
Syndro101 Feb 5, 2025
03665fc
Fixup maps in TGM format
Syndro101 Feb 5, 2025
17312ec
Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMS…
Syndro101 Feb 5, 2025
8b33b6f
Fixes 1: Fixes floating semotics mentioned on github, floating button…
Syndro101 Feb 6, 2025
765234e
Fixup maps in TGM format
Syndro101 Feb 6, 2025
3284e66
Remade intel office to be more spacious, removed some rails that dont…
Syndro101 Feb 6, 2025
910b0e7
Fixup maps in TGM format
Syndro101 Feb 6, 2025
f50bff6
fixed access to saferoom, minor fixes to misplaced lights and other t…
Syndro101 Feb 6, 2025
c26256a
Fixup maps in TGM format
Syndro101 Feb 6, 2025
ff95b1d
Hydrogen tanks readded for OT, intercom outside CIC, moved stairwell …
Syndro101 Feb 6, 2025
9e7ad36
Fixup maps in TGM format
Syndro101 Feb 6, 2025
13dc73d
minor tile changes
Syndro101 Feb 6, 2025
1e1c112
Fixup maps in TGM format
Syndro101 Feb 6, 2025
71b95b5
it'd be nice if the icon check didnt take a half hour to even run.
Syndro101 Feb 6, 2025
f0ab385
Fixup maps in TGM format
Syndro101 Feb 6, 2025
b2dc526
maybe final?
Syndro101 Feb 6, 2025
a5a631e
Fixup maps in TGM format
Syndro101 Feb 6, 2025
cd85a28
small changes to pilot doors access. added some tarbacks to the SEA o…
Syndro101 Feb 8, 2025
0489c9e
Merge remote-tracking branch 'cmss13-devs/master' into Almayer_Renova…
Feb 13, 2025
74f7aab
Maint Access fix
Feb 13, 2025
25bb620
Curse of the Forest
Feb 13, 2025
761677a
Merge branch 'cmss13-devs:master' into Almayer_Renovation
Syndro101 Feb 17, 2025
24a7be3
goes over some of the reviews concerns
Syndro101 Feb 18, 2025
32cd41e
Fixup maps in TGM format
Syndro101 Feb 18, 2025
468158d
Merge branch 'master' of https://github.com/Syndro101/CMSS13 into Alm…
Syndro101 Feb 18, 2025
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
27 changes: 21 additions & 6 deletions code/game/area/almayer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
icon_state = "airoom"
fake_zlevel = 1 // upperdeck

/area/almayer/command/cicconference
name = "\improper CIC Conference Room"
icon_state = "cic"
fake_zlevel = 1 // upperdeck

/area/almayer/command/airoom
name = "\improper AI Core"
icon_state = "airoom"
Expand All @@ -80,7 +85,7 @@
resin_construction_allowed = FALSE

/area/almayer/command/securestorage
name = "\improper Upper Deck Secure Storage"
name = "\improper Computer Lab Secure Storage"
icon_state = "corporatespace"
fake_zlevel = 1 // upperdeck

Expand Down Expand Up @@ -560,11 +565,6 @@
icon_state = "livingspace"
fake_zlevel = 2

/area/almayer/living/auxiliary_officer_office
name = "\improper Lower Deck Auxiliary Support Officer office"
icon_state = "livingspace"
fake_zlevel = 2

/area/almayer/living/cryo_cells
name = "\improper Lower Deck Cryo Cells"
icon_state = "cryo"
Expand Down Expand Up @@ -615,6 +615,16 @@
icon_state = "officerstudy"
fake_zlevel = 1 // upperdeck

/area/almayer/living/auxiliary_officer_office
name = "\improper Upper Deck Auxiliary Support Officer office"
icon_state = "livingspace"
fake_zlevel = 1 // upperdeck

/area/almayer/living/intel
name = "\improper Intelligence Officer's Bunks"
icon_state = "livingspace"
fake_zlevel = 1 // upperdeck

/area/almayer/living/cafeteria_port
name = "\improper Cafeteria Port"
icon_state = "food"
Expand All @@ -640,6 +650,11 @@
icon_state = "briefing"
fake_zlevel = 2 // lowerdeck

/area/almayer/living/offices/cryo
name = "\improper Support Crew Cryogenics Bay"
icon_state = "cryo"
fake_zlevel = 2 // lowerdeck

/area/almayer/living/offices/flight
name = "\improper Flight Office"

Expand Down
13 changes: 13 additions & 0 deletions code/modules/clothing/glasses/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@
if(report)
report.read_paper(user)

/obj/item/clothing/glasses/hud/health/basic
name = "\improper Basic HealthMate HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. This one is a simpler model."
hud_type = MOB_HUD_MEDICAL_BASIC
req_skill = NONE
req_skill_level = NONE
actions_types = list(/datum/action/item_action/toggle)

/obj/item/clothing/glasses/hud/health/basic/prescription
name = "\improper Prescription Basic HealthMate HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. This simpler model contains prescription lenses."
prescription = TRUE

/obj/item/clothing/glasses/hud/health/science
name = "custom HealthMate HUD" // combined HealthMateHUD and Reagent Scanner HUD for CMO
desc = "These HealthMate HUD googles are modified with a light-weight titantium-alloy frame that is custom fitted with extra wiring and low profile components from a reagent analyzer, allowing them to combine the functionality of a HealthMate and reagent scanner HUD without compromising on the form of the googles."
Expand Down
Binary file modified icons/obj/structures/closet.dmi
Binary file not shown.
Loading