Adds rooftop event assets (#12572)

This commit is contained in:
kyres1
2021-10-06 17:21:15 -05:00
committed by GitHub
parent 3fe82884ee
commit b59fc11ecc
24 changed files with 1287 additions and 1 deletions
+4
View File
@@ -2846,6 +2846,7 @@
#include "code\modules\shieldgen\shield_gen_external.dm"
#include "code\modules\shieldgen\shieldwallgen.dm"
#include "code\modules\shuttles\antagonist.dm"
#include "code\modules\shuttles\city.dm"
#include "code\modules\shuttles\departmental.dm"
#include "code\modules\shuttles\escape_pods.dm"
#include "code\modules\shuttles\landmarks.dm"
@@ -3031,6 +3032,9 @@
#include "maps\aurora\code\aurora_shuttles.dm"
#include "maps\aurora\code\aurora_unittest.dm"
#include "maps\event\code\event.dm"
#include "maps\event\rooftop\code\rooftop.dm"
#include "maps\event\rooftop\code\rooftop_areas.dm"
#include "maps\event\rooftop\code\rooftop_shuttles.dm"
#include "maps\exodus\code\exodus.dm"
#include "maps\exodus\code\exodus_areas.dm"
#include "maps\exodus\code\exodus_holodeck.dm"
@@ -63,3 +63,10 @@
/obj/item/device/flashlight/lamp/lava/yellow
light_color = COLOR_YELLOW
/obj/item/device/flashlight/lamp/stage
name = "stage lamp"
desc = "A portable, beautiful and flashy stage light!"
light_color = COLOR_ORANGE
icon_state = "stage"
item_state = "stage"
@@ -113,3 +113,9 @@
desc = "Something that should not exist."
icon_state = "megaphone_clown"
item_state = "megaphone_clown"
/obj/item/device/megaphone/stagemicrophone
name = "dazzling stage microphone"
desc = "A glamorous looking stage microphone, complete with running lights and holographic effects around it."
icon_state = "stagemicrophone"
item_state = "stagemicrophone"
+45 -1
View File
@@ -561,6 +561,50 @@
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN)
/obj/item/clothing/head/helmet/space/void/golden_deep
name = "golden helmet"
desc = "A glamorous, decorated helmet plated with gold. Very hefty."
icon = 'icons/obj/clothing/voidsuit/golden_deep.dmi'
icon_state = "goldhelm"
item_state = "goldhelm"
contained_sprite = 1
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_PISTOL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
brightness_on = 6
/obj/item/clothing/suit/space/void/golden_deep
name = "golden suit"
desc = "A very heavy, gold-plated suit. Fabulous!"
icon = 'icons/obj/clothing/voidsuit/golden_deep.dmi'
icon_state = "goldsuit"
item_state = "goldsuit"
contained_sprite = 1
slowdown = 1
w_class = ITEMSIZE_NORMAL
armor = list(
melee = ARMOR_MELEE_RESISTANT,
bullet = ARMOR_BALLISTIC_MEDIUM,
laser = ARMOR_LASER_PISTOL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
siemens_coefficient = 0.35
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
/obj/item/clothing/head/helmet/space/void/mining/himeo
name = "himeo mining voidsuit helmet"
desc = "A rugged polymer and alloy space helmet with a ballistic glass and polycarbonate visor commonly used by astronauts from Himeo."
@@ -711,7 +755,7 @@
/obj/item/clothing/head/helmet/space/void/atmos/himeo/tajara
name = "himeo atmospherics voidsuit helmet"
desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model is fitted for Tajara and appears to have a thicker layer of insulation on it."
desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model is fitted for Tajara and appears to have a thicker layer of insulation on it."
desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
@@ -168,6 +168,14 @@
flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 1.5
/obj/item/clothing/suit/golden_tailcoat
name = "golden tailcoat"
desc = "A brilliant looking golden tailcoat of sorts."
icon = 'icons/clothing/suits/goldendeep_tailcoat.dmi'
icon_state = "tailcoat"
item_state = "tailcoat"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/toggle/bomber
name = "bomber jacket"
desc = "A thick, well-worn WW2 leather bomber jacket."
+4
View File
@@ -0,0 +1,4 @@
/obj/machinery/computer/shuttle_control/city
name = "city transit shuttle control console"
shuttle_tag = "City Transit Shuttle"
light_color = LIGHT_COLOR_RED
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: kyres1
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds a rooftop event map."
- rscadd: "Adds rooftop event assets."
Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 466 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 887 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 KiB

After

Width:  |  Height:  |  Size: 336 KiB

+28
View File
@@ -0,0 +1,28 @@
/datum/map/event/rooftop
name = "Rooftop"
full_name = "Mendell City Rooftop"
path = "event/rooftop"
lobby_icons = list('icons/misc/titlescreens/mendell/mendell_city.dmi')
lobby_transitions = FALSE
allowed_jobs = list(/datum/job/visitor)
station_levels = list(1)
admin_levels = list()
contact_levels = list(1)
player_levels = list(1)
accessible_z_levels = list(1)
station_name = "The Montparnasse"
station_short = "Montparnasse"
dock_name = "conglomerate spaceport"
boss_name = "Idris Incorporated"
boss_short = "Idris"
company_name = "Idris Incorporated"
company_short = "Idris"
use_overmap = FALSE
map_shuttles = list(
/datum/shuttle/autodock/ferry/city
)
+25
View File
@@ -0,0 +1,25 @@
/area/city
name = "City"
icon_state = "blue"
luminosity = 1
dynamic_lighting = 0
requires_power = 0
no_light_control = 1
/area/city/mendell
name = "Mendell City"
/area/city/mendell/interior
name = "Mendell City Interior"
luminosity = 0
requires_power = 0
dynamic_lighting = 1
no_light_control = 0
/area/shuttle/city
name = "City Transit Shuttle"
base_turf = /turf/unsimulated/floor/plating
luminosity = 1
dynamic_lighting = 0
requires_power = 0
no_light_control = 1
@@ -0,0 +1,31 @@
/datum/shuttle/autodock/ferry/city
name = "City Transit Shuttle"
location = 1
warmup_time = 10
shuttle_area = /area/shuttle/city
move_time = 50
dock_target = "City Transit Shuttle"
waypoint_station = "nav_city_dock"
landmark_transition = "nav_city_interim"
waypoint_offsite = "nav_city_start"
/obj/effect/shuttle_landmark/city/start
name = "City Shuttle Base"
landmark_tag = "nav_city_start"
docking_controller = "city_station"
base_turf = /turf/unsimulated/floor/plating
base_area = /area/city/mendell
/obj/effect/shuttle_landmark/city/interim
name = "In Transit"
landmark_tag = "nav_city_interim"
base_turf = /turf/unsimulated/floor/plating
base_area = /area/city/mendell
/obj/effect/shuttle_landmark/city/dock
name = "city Shuttle Dock"
landmark_tag = "nav_city_dock"
docking_controller = "city_shuttle_dock"
landmark_flags = SLANDMARK_FLAG_AUTOSET
base_turf = /turf/unsimulated/floor/plating
base_area = /area/city/mendell
File diff suppressed because it is too large Load Diff