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

[WIP] Zorka Colony Fortress #445

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions code/game/area/zorka.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/area/zorka
name = "\improper Zorka Fortress"
icon_state = "ice_colony"
icon_state = "cliff_blocked"
can_build_special = TRUE
powernet_name = "ground"
minimap_color = MINIMAP_AREA_COLONY

/area/zorka/exterior
name = "\improper Snow Desert"
requires_power = 1
always_unpowered = 1
power_light = FALSE
power_equip = FALSE
power_environ = FALSE
temperature = ICE_COLONY_TEMPERATURE
soundscape_playlist = SCAPE_PL_WIND

/area/zorka/fortress
icon_state = "clear"
ceiling = CEILING_METAL
5 changes: 5 additions & 0 deletions code/game/objects/structures/landing_signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,8 @@
name = "Chigusa Shipyard Sign"
desc = "A large sign that reads 'Chigusa Shipyard - Subsidary of Weyland-Yutani Corporation'. Acid burns checker the sign like buckshot."
icon_state = "laz_sign" //TODO make unique icon.

/obj/structure/lz_sign/zorka_sign
name = "Zorka Border Colony Sign"
desc = "A large sign that reads 'Zorka - 3OPKA - POP.68 - 31.03, 2182'. Despite being covered in snow, it looks brand new and very sturdy."
icon_state = "zorka_sign"
6 changes: 6 additions & 0 deletions code/game/objects/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@
/obj/structure/sign/double/maltesefalcon/right
icon_state = "maltesefalcon-right"

/obj/structure/sign/upp_sivtsev_table
name = "\improper Sivtsev table"
desc = "The Sivtsev table is a standardized table for testing visual acuity, which was developed in 1923 by Soviet ophthalmologist D. A. Sivtsev."
desc_lore = "The table consists of series of the Cyrillic letters Ш, Б, М, Н, К, Ы, and И in a definite order representing visual acuity values between 0.1 and 2.0."
icon_state = "sivtsev"

//============//
// Banners //
//==========//
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
clothing_traits = list(TRAIT_EAR_PROTECTION) //the sprites clearly fully cover the ears and most of the head

/obj/item/clothing/head/helmet/marine/veteran/UPP/snow
icon_state = "s_upp_helmet"

/obj/item/clothing/head/helmet/marine/veteran/UPP/engi
name = "\improper UM4-V helmet"
desc = "This version of the UM4 helmet has a ballistic-glass visor, allowing for the UPP Engineers to safely weld, but by some reports hindering sight in the process."
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/suits/marine_armor/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@
storage_slots = 3
uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi)

/obj/item/clothing/suit/storage/marine/faction/UPP/snow
icon_state = "s_upp_armor"

/obj/item/clothing/suit/storage/marine/faction/UPP/support
name = "\improper UL6 personal armor"
desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,10 @@
suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/marine/smartgunner/upp)
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE

/obj/item/clothing/under/marine/veteran/UPP/snow
icon_state = "s_upp_uniform"
worn_state = "s_upp_uniform"

/obj/item/clothing/under/marine/veteran/UPP/boiler
name = "\improper UPP operations fatigues"
desc = "A set of UPP operations fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@
#include "code\game\area\techtree.dm"
#include "code\game\area\varadero.dm"
#include "code\game\area\WhiskeyOutpost.dm"
#include "code\game\area\zorka.dm"
#include "code\game\camera_manager\camera_manager.dm"
#include "code\game\cas_manager\datums\cas_fire_envelope.dm"
#include "code\game\cas_manager\datums\cas_fire_mission.dm"
Expand Down
Binary file modified icons/obj/structures/machinery/ai.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/64x128.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/decals.dmi
Binary file not shown.
Binary file modified icons/obj/structures/props/landing_signs.dmi
Binary file not shown.
Binary file modified icons/obj/structures/structures.dmi
Binary file not shown.
3 changes: 3 additions & 0 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ endmap

map whiskey_outpost_v2
endmap

map zorka
endmap
167 changes: 167 additions & 0 deletions maps/map_files/zorka/sprinkles/25.engioutpost.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/floor/plating,
/area/space)
"c" = (
/obj/effect/landmark/nightmare,
/turf/closed/wall/strata_outpost/reinforced,
/area/space)
"j" = (
/obj/structure/machinery/power/smes,
/obj/structure/machinery/power/smes{
pixel_y = 16
},
/turf/open/floor/plating,
/area/space)
"m" = (
/turf/closed/wall/strata_outpost/reinforced,
/area/space)
"p" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/space)
"r" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/space)
"s" = (
/obj/structure/pipes/standard/tank/oxygen,
/turf/open/floor/plating,
/area/space)
"K" = (
/obj/structure/pipes/standard/tank/nitrogen,
/turf/open/floor/plating,
/area/space)
"S" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/turf/open/floor/plating,
/area/space)
"T" = (
/obj/structure/surface/table/reinforced/black,
/turf/open/floor/plating,
/area/space)
"W" = (
/obj/structure/closet/secure_closet/engineering_welding,
/turf/open/floor/plating,
/area/space)

(1,1,1) = {"
m
m
a
m
m
m
m
m
m
c
"}
(2,1,1) = {"
m
r
a
a
S
m
a
T
T
m
"}
(3,1,1) = {"
m
r
a
a
a
a
a
a
a
m
"}
(4,1,1) = {"
m
a
a
a
a
m
s
a
a
a
"}
(5,1,1) = {"
m
a
a
a
p
m
K
a
a
m
"}
(6,1,1) = {"
m
a
a
a
W
m
m
m
m
m
"}
(7,1,1) = {"
m
a
a
a
a
m
a
a
a
m
"}
(8,1,1) = {"
m
a
a
a
a
a
a
j
a
m
"}
(9,1,1) = {"
m
a
T
T
T
m
a
a
a
m
"}
(10,1,1) = {"
m
m
m
m
m
m
m
m
m
m
"}
Loading
Loading