Event/Away Site Sprite Spring Cleaning (#18318)

* Event/Away Site Sprite Spring Cleaning

* whoops

* fixes

* news

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/light_pole.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* prop hunt

* Gamers

* merge conflict again

* really

* signs

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2024-02-16 11:16:22 +00:00
committed by GitHub
co-authored by Fluffy
parent 0abacc8d16
commit 320c482f51
49 changed files with 1682 additions and 1652 deletions
+1 -22
View File
@@ -1,14 +1,3 @@
/obj/structure/beach_umbrella
name = "overhead beach umbrella"
desc = "A tightly secured beach umbrella which looks pretty elegant against the sun."
icon = 'icons/obj/structure/urban/misc_64x64.dmi'
icon_state = "umbrella"
anchored = TRUE
layer = 9
/obj/structure/beach_umbrella/alt
icon_state = "umbrella_alt"
/obj/structure/dock_structure
name = "docking tie"
desc = "A large, very secure tie-off point for a dock."
@@ -34,14 +23,4 @@
icon_state = "radio_ship"
anchored = TRUE
density = TRUE
layer = 9
/obj/structure/crane
name = "overhead guiding crane"
desc = "A towering crane for lifting industrial sized cargo."
icon = 'icons/obj/structure/industrial/cranes.dmi'
icon_state = "crane"
anchored = TRUE
density = TRUE
layer = 9
pixel_x = -16
layer = ABOVE_ALL_MOB_LAYER
@@ -0,0 +1,89 @@
/obj/structure/ac_unit
name = "AC unit"
desc = "A bland air conditioning unit."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "ac"
layer = BELOW_OBJ_LAYER
density = TRUE
/obj/structure/television
name = "wide-screen television"
desc = "A fancy wide-screen television with a wide selection of channels."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "television"
anchored = TRUE
/obj/structure/console
name = "\improper Game-Box"
desc = "A generic video-games console. For *Gamers*."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "games_console"
anchored = TRUE
/obj/structure/pylon
name = "charging pylon"
desc = "A charging pylon attached to a nearby port."
icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_port"
density = TRUE
anchored = TRUE
/obj/structure/shelf
name = "shelf"
desc = "A nondescript decorative shelf."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "shelf1"
/obj/structure/shelf/Initialize(mapload)
. = ..()
icon_state = "shelf[pick(1,2,3)]"
/obj/structure/outlet
name = "power outlets"
desc = "The *other* kind of power-point."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "outlet"
layer = LAYER_UNDER_TABLE
/obj/structure/vent
name = "wall vent"
desc = "A nondescript vent."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "vent"
layer = LAYER_UNDER_TABLE
/obj/structure/window
name = "window"
desc = "Lets the light in and keeps the bugs out."
icon = 'icons/obj/structure/miscellaneous.dmi'
icon_state = "window"
// 64x64 stuff
/obj/structure/beach_umbrella
name = "overhead beach umbrella"
desc = "A tightly secured beach umbrella which looks pretty elegant against the sun."
icon = 'icons/obj/structure/64x64_misc.dmi'
icon_state = "umbrella"
anchored = TRUE
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/beach_umbrella/alt
icon_state = "umbrella_alt"
/obj/structure/crane
name = "overhead guiding crane"
desc = "A towering crane for lifting industrial sized cargo."
icon = 'icons/obj/structure/64x64_machinery.dmi'
icon_state = "crane"
anchored = TRUE
density = TRUE
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/crane/body
icon_state = "crane_body"
density = FALSE
/obj/structure/crane/arm
icon_state = "crane_arm"
density = FALSE
+48 -28
View File
@@ -16,26 +16,30 @@
/obj/structure/light_pole/konyang
name = "dangling lamp"
desc = "A flame-lit lamp dangling precariously from a tall pole."
icon = 'icons/obj/structure/urban/poles.dmi'
icon_state = "right_lamp"
layer = 9.1
icon = 'icons/obj/structure/urban/streetpoles.dmi'
icon_state = "lamp"
layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
density = FALSE
light_color = "#FA644B"
light_wedge = LIGHT_OMNI
light_range = 6
light_power = 1
pixel_x = -32
pixel_y = 8
/obj/structure/light_pole/konyang/left
icon_state = "left_lamp"
dir = NORTH
/obj/structure/utility_pole
name = "tall pole"
desc = "A very tall utility pole for urban infrastructure."
icon = 'icons/obj/structure/urban/poles.dmi'
icon = 'icons/obj/structure/urban/streetpoles.dmi'
icon_state = "junction"
layer = 9
layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
pixel_x = -32
pixel_y = 8
/obj/structure/utility_pole/gwok
name = "Go Go Gwok street sign"
@@ -43,38 +47,52 @@
icon = 'icons/obj/structure/urban/konyang64x96.dmi'
icon_state = "nice_gwok"
// street lights
/obj/structure/utility_pole/street
desc = "A tall light source. This one seems to be off."
icon = 'icons/obj/structure/urban/poles.dmi'
icon_state = "street"
/obj/effect/overlay/street_light
icon = 'icons/obj/structure/urban/poles.dmi'
icon_state = "street_light"
layer = EFFECTS_ABOVE_LIGHTING_LAYER
/obj/effect/overlay/street_light/classic
icon_state = "classic_lamp_light"
density = 1
name = "\improper street lamp"
desc = "A tall light source. What more is there to say?"
icon = 'icons/obj/structure/urban/streetpoles.dmi'
icon_state = "streetlight"
/obj/structure/utility_pole/street/on
desc = "A tall light source. This one shines brightly."
light_wedge = LIGHT_OMNI
light_color = "#e8ffeb"
light_range = 8
light_power = 1.9
/obj/structure/utility_pole/street/on/Initialize(mapload)
. = ..()
cut_overlays()
overlays += /obj/effect/overlay/street_light
return
/obj/structure/utility_pole/street/corner
name = "\improper street lamp"
desc = "A tall light source. What more is there to say?"
icon_state = "streetlightcorner"
/obj/structure/utility_pole/street/corner/on
light_wedge = LIGHT_OMNI
light_color = "#e8ffeb"
light_range = 8
light_power = 1.9
/obj/structure/utility_pole/street/double
name = "\improper street lamp"
desc = "A tall light source. What more is there to say?"
icon_state = "streetlightduo"
/obj/structure/utility_pole/street/double/on
light_wedge = LIGHT_OMNI
light_color = "#e8ffeb"
light_range = 8
light_power = 1.9
/obj/structure/utility_pole/street/classic
name = "\improper stone lamp"
desc = "A stone lamp commonly found in Konyang."
icon_state = "classic_lamp"
/obj/effect/overlay/street_light/classic
icon_state = "classic_lamp_light"
density = TRUE
/obj/structure/utility_pole/street/classic/on
desc = "A tall light source. This one shines brightly."
light_wedge = LIGHT_OMNI
light_color = LIGHT_COLOR_TUNGSTEN
light_range = 8
@@ -112,7 +130,7 @@
/obj/structure/utility_pole/street/traffic
name = "traffic indicator"
desc = "A very tall crosswalk indicator which can be used to better run red lights."
icon_state = "traffic"
icon_state = "trafficlight"
light_color = LIGHT_COLOR_HALOGEN
light_range = 3.1
light_power = 2.6
@@ -139,9 +157,11 @@
/obj/effect/overlay/overhead_line
name = "overhead utility line"
icon = 'icons/obj/structure/urban/poles.dmi'
icon = 'icons/obj/structure/urban/streetpoles.dmi'
icon_state = "line"
layer = 9.1
layer = ABOVE_ALL_MOB_LAYER
pixel_x = -32
pixel_y = 8
/obj/effect/overlay/overhead_line/end
icon_state = "line_end"
+56
View File
@@ -625,3 +625,59 @@
door to the tent with her body as the insurgents attempted to shoot through it. While she ultimately perished to gunfire, her sacrifice allowed the medical tent to be evacuated and let \
the 23rd capture all insurgents involved in the attack. Formerly a frontierswoman with no nation to call her own, she was buried with military honors and became the first Holy Martyr of \
Sun Reach in 2426. She is commonly venerated on Sun Reach and by Mazals throughout the Empire."
// Urban
/obj/structure/sign/exit
name = "exit sign"
desc = "A sign indicating where you should probably go in a hurry."
icon_state = "exit"
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/sign/restroom
name = "restroom sign"
desc = "A sign indicating where you can find a restroom."
icon_state = "restroom"
/obj/structure/sign/staff
name = "staff only sign"
desc = "A sign that warns of this entry being barred to the public."
icon_state = "staff"
/obj/structure/sign/double
icon = 'icons/obj/structure/64x32_signs.dmi'
/obj/structure/sign/double/hotel_montparnasse
name = "glamorous sign"
desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"
icon_state = "hotel_montparnasse"
/obj/structure/sign/double/convenience
name = "convenience store sign"
desc = "A sign labeling the structure as a 24-7 MINI MART. Convenient!"
icon_state = "shop_sign"
/obj/structure/sign/double/police
name = "police station sign"
desc = "A sign labeling the structure as a Konyang police department building."
icon_state = "police_sign"
/obj/structure/sign/double/robotics
name = "robotics clinic sign"
desc = "A sign labeling the structure as a robotics and clinical support building."
icon_state = "krc_sign"
/obj/structure/sign/double/bar
name = "club and bar sign"
desc = "A sign labeling the structure as the Resting Tiger nightclub and bar."
icon_state = "bar_sign"
/obj/structure/sign/double/arcade
name = "arcade sign"
desc = "A sign labeling the structure as a very cool arcade."
icon_state = "arcade_sign"
/obj/structure/sign/double/pharmacy
name = "pharmacy sign"
desc = "A sign labeling the structure as a Konyang health and supply pharmacy."
icon_state = "pharmacy_sign"
+102 -101
View File
@@ -5,7 +5,7 @@
icon_state = "car"
anchored = TRUE
density = TRUE
layer = 7
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/automobile/random/Initialize(mapload)
. = ..()
@@ -28,44 +28,105 @@
anchored = TRUE
density = TRUE
/obj/structure/road_sign
// Street Signs
/obj/structure/street_sign
name = "stop sign"
desc = "A stop sign to direct traffic. Sometimes a demand."
icon = 'icons/obj/structure/urban/road_signs.dmi'
icon = 'icons/obj/structure/urban/street_signs.dmi'
icon_state = "stop"
layer = 9
layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
/obj/structure/road_sign/yield
/obj/structure/street_sign/stop_konyang
icon_state = "stop_konyang"
desc = "A stop sign. You can't be really sure unless you speak Konyang."
/obj/structure/street_sign/yield
name = "yield sign"
desc = "A yield sign which tells you to slow down, rather politely. Let's hope you listen."
icon_state = "yield"
/obj/structure/road_sign/pedestrian
name = "pedestrian passing sign"
desc = "A yellow sign which alerts you of bonus points ahead."
icon_state = "pedestrian"
/obj/structure/street_sign/warnings
name = "warning sign"
desc = "A sign. You think it's trying to warn you of something."
icon_state = "warnings"
/obj/structure/road_sign/turn
/obj/structure/street_sign/directional
name = "turn ahead sign"
desc = "A sign which warns of an approaching turn to the right. Is it the right choice?"
icon_state = "right"
desc = "A directional sign. How the turntables..."
icon_state = "directional"
/obj/structure/road_sign/turn/left
desc = "A sign which warns of an approaching turn to the left. Is anything left?"
icon_state = "left"
/obj/structure/street_sign/directional/yellow
icon_state = "directional_yellow"
/obj/structure/road_sign/street
/obj/structure/street_sign/street
name = "street sign"
desc = "A green, wide street sign with words telling you that you are indeed on a street."
icon_state = "street_big"
desc = "A street sign. As common as they are, sometimes people still get lost."
icon_state = "street"
var/street_name = null
/obj/structure/road_sign/street/Initialize(mapload)
/obj/structure/street_sign/street/Initialize(mapload)
. = ..()
name = "[street_name]"
desc = "This sign indicates this crossing street is called [street_name]."
desc = "A street sign for [street_name]. As common as they are, sometimes people still get lost."
/obj/structure/street_sign/street/both
dir = NORTH
/obj/structure/street_sign/street/right
dir = WEST
/obj/structure/street_sign/street/left
dir = EAST
/obj/structure/ms13/street_sign/turning
desc = "A stop sign. Looks like you've passed the point of no return."
icon_state = "noturn"
/obj/structure/street_sign/parking
desc = "A sign. No parking allowed."
icon_state = "noparking"
/obj/structure/street_sign/one_way
desc = "A sign. Apparently you can only go one direction..."
icon_state = "direction"
/obj/structure/street_sign/bus
desc = "A bus sign. If you had to guess, you have to wait for a bus here."
icon_state = "busstop"
/obj/structure/street_sign/railroad
desc = "A sign. This one is a big white X. Wonder what that entails?"
icon_state = "railcrossing"
/obj/structure/street_sign/only_direction
desc = "A sign. It's telling you to only go this way."
icon_state = "onlydir"
/obj/structure/street_sign/speed
desc = "A sign. Always trying to slow you down."
icon_state = "speed"
/obj/structure/street_sign/turn
desc = "A sign. It's pointing a direction with arrows on it. Cool."
icon_state = "turn"
/obj/structure/street_sign/exit
desc = "A sign. It's showing you to an exit."
icon_state = "exit"
/obj/structure/street_sign/nopedestrian
desc = "A sign. Only operators of heavy machinery allowed!"
icon_state = "nopedestrian"
/obj/structure/street_sign/drive_thru
name = "drive thru sign"
desc = "A drive-thru sign."
icon_state = "drivethru"
// infrastructure
/obj/structure/stairs/urban
icon = 'icons/obj/structure/urban/ledges.dmi'
@@ -113,16 +174,6 @@
/obj/structure/structural_support/side
icon_state = "truss_side"
/obj/structure/urban/pylon
name = "vehicle charging pylon"
desc = "A vehicle-grade charging pylon attached to a nearby port."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "chargepylon"
light_color = LIGHT_COLOR_CYAN
light_range = 1.2
density = TRUE
anchored = TRUE
/obj/structure/manhole
name = "sewer access manhole"
desc = "Probably a bad idea to open this."
@@ -176,13 +227,6 @@
layer = ABOVE_ALL_MOB_LAYER
anchored = TRUE
/obj/structure/television
name = "wide-screen television"
desc = "A fancy wide-screen television with a wide selection of channels."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "television"
anchored = TRUE
/obj/structure/dressing_divider
name = "wardrobe dressing divider"
desc = "A divider for an environment where you're probably swapping clothes, made with your privacy in mind."
@@ -197,7 +241,7 @@
icon = 'icons/obj/structure/urban/konyang_neon.dmi'
icon_state = "sign1"
anchored = TRUE
layer = 7
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/shipping_container
name = "freight container"
@@ -206,13 +250,13 @@
icon_state = "blue1"
anchored = TRUE
density = TRUE
layer = 7
layer = ABOVE_ALL_MOB_LAYER
/obj/effect/overlay/container_logo
name = "Hephaestus Industries emblem"
icon = 'icons/obj/structure/industrial/shipping_containers.dmi'
icon_state = "heph1"
layer = 7.01
layer = 4.6
/obj/effect/overlay/container_logo/einstein
name = "Einstein Engines emblem"
@@ -231,7 +275,7 @@
density = TRUE
throwpass = TRUE
climbable = TRUE
layer = 4.01
layer = ABOVE_MOB_LAYER
anchored = TRUE
/obj/structure/rod_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -262,7 +306,7 @@
density = TRUE
throwpass = TRUE
anchored = TRUE
layer = 4.01
layer = ABOVE_MOB_LAYER
/obj/structure/road_barrier
name = "roadway barrier"
@@ -273,7 +317,7 @@
throwpass = TRUE
climbable = TRUE
anchored = TRUE
layer = 4.01
layer = ABOVE_MOB_LAYER
//smoothing these things would suck so here you go. i have no idea why you would want these buildable. map them manually
/obj/structure/road_barrier/bot_in
@@ -309,16 +353,28 @@
return TRUE
/obj/structure/chainlink_fence
name = "chainlink industrial fencing"
name = "chainlink fence"
desc = "A tall, imposing metal fence. Not to be confused with the slightly more popular Chainlink of recent years."
icon = 'icons/obj/structure/industrial/fencing_tall.dmi'
icon = 'icons/obj/structure/obstacles/obstacles.dmi'
density = TRUE
icon_state = "fence"
icon_state = "normal_fence"
color = null
anchored = TRUE
can_be_unanchored = FALSE
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/chainlink_fence/corner
icon_state = "fence_corner"
/obj/structure/chainlink_fence/intersect_bottom
icon_state = "fence_intersect_bottom"
/obj/structure/chainlink_fence/intersect_middle
icon_state = "fence_intersect_middle"
/obj/structure/chainlink_fence/intersect_corner
icon_state = "fence_intersect_corner"
/obj/structure/chainlink_fence/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover,/obj/item/projectile))
return TRUE
@@ -393,13 +449,6 @@
desc = "A bronze statue of the Amitabha Buddha, the Buddha of Limitless Light."
icon_state = "buddha"
/obj/structure/sign/urban
name = "exit sign"
desc = "A sign indicating where you should probably go in a hurry."
icon = 'icons/obj/structure/urban/infrastructure.dmi'
icon_state = "exit"
layer = ABOVE_ALL_MOB_LAYER
/obj/structure/sign/billboard
name = "commercial billboard"
desc = "A large and typically roadside billboard rented out for advertisement space."
@@ -421,23 +470,6 @@
icon_state = "sign[rand(1, 14)]"
return
/obj/structure/sign/urban/drive_thru
name = "drive thru sign"
desc = "A drive-thru sign."
icon = 'icons/obj/structure/urban/restaurant.dmi'
icon_state = "drivethru"
density = 1
/obj/structure/sign/urban/restroom
name = "restroom sign"
desc = "A sign indicating where you can find a restroom."
icon_state = "restroom"
/obj/structure/sign/urban/staff
name = "staff only sign"
desc = "A sign that warns of this entry being barred to the public."
icon_state = "staff"
/obj/structure/restaurant_menu
name = "restaurant menu"
desc = "A sign displaying a variety of delectable meals."
@@ -466,37 +498,6 @@
return TRUE
return ..()
/obj/structure/sign/urban/konyang
name = "convenience store sign"
desc = "A sign labeling the structure as a 24-7 MINI MART. Convenient!"
icon = 'icons/obj/structure/urban/konyang_signs.dmi'
icon_state = "shop_sign"
/obj/structure/sign/urban/konyang/police
name = "police station sign"
desc = "A sign labeling the structure as a Konyang police department building."
icon_state = "police_sign"
/obj/structure/sign/urban/konyang/robotics
name = "robotics clinic sign"
desc = "A sign labeling the structure as a robotics and clinical support building."
icon_state = "krc_sign"
/obj/structure/sign/urban/konyang/bar
name = "club and bar sign"
desc = "A sign labeling the structure as the Resting Tiger nightclub and bar."
icon_state = "bar_sign"
/obj/structure/sign/urban/konyang/arcade
name = "arcade sign"
desc = "A sign labeling the structure as a very cool arcade."
icon_state = "arcade_sign"
/obj/structure/sign/urban/konyang/pharmacy
name = "pharmacy sign"
desc = "A sign labeling the structure as a Konyang health and supply pharmacy."
icon_state = "pharmacy_sign"
/obj/structure/window/urban
icon = 'icons/obj/structure/urban/windows_tall.dmi'
icon_state = "wood"