mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 05:51:56 +01:00
Adds the ability to have decals with inscriptions (#4932)
As it sais on the tin. Also adds a few things to the station that were requested by lore.
This commit is contained in:
@@ -21,6 +21,8 @@
|
||||
if(!T.decals) T.decals = list()
|
||||
T.decals |= floor_decals[cache_key]
|
||||
T.add_overlay(floor_decals[cache_key])
|
||||
if(desc)
|
||||
T.desc += "<br>There is \a [src] on it with the following inscription:<br><i>[desc]</i>"
|
||||
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -37,6 +37,9 @@
|
||||
if (!mapload)
|
||||
make_plating(defer_icon_update = 1)
|
||||
flooring = newflooring
|
||||
//Set the initial strings
|
||||
name = flooring.name
|
||||
desc = flooring.desc
|
||||
if (mapload)
|
||||
queue_icon_update()
|
||||
else
|
||||
|
||||
@@ -7,9 +7,7 @@
|
||||
var/list/to_add = list()
|
||||
|
||||
if(flooring)
|
||||
// Set initial icon and strings.
|
||||
name = flooring.name
|
||||
desc = flooring.desc
|
||||
// Set initial icon.
|
||||
icon = flooring.icon
|
||||
|
||||
if(flooring_override)
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
################################
|
||||
# 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
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Arrow768
|
||||
|
||||
# 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:
|
||||
- maptweak: "Various plaques have been placed around the station to memorize the odin murders."
|
||||
@@ -17000,6 +17000,9 @@
|
||||
dir = 4;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/effect/floor_decal/plaque{
|
||||
desc = "Charles Hall Memorial Hall<br>Charles Hall was the 2nd victim of the infamous Odin Killer. From beginnings as an orphan, he rose to Head of Security and dedicated his life to ensuring security was robust and effective. He will be missed.<br>March 2425 - June 2460"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/brig)
|
||||
"aFr" = (
|
||||
@@ -64769,6 +64772,27 @@
|
||||
/obj/item/weapon/crowbar,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/outpost/mining_main/eva)
|
||||
"cKq" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lime{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/floor_decal/plaque{
|
||||
desc = "Charlie Dove Memorial Hall<br>With an endless capacity for kindness, she used her skills as a doctor to better the lives of everyone she met. She was the 4th victim murdered by the notorious Odin Killer, and will be missed.<br>December 2416 - June 2460"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/starboard)
|
||||
"grp" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/plaque{
|
||||
desc = "Mikail Ivanovich Memorial<br>The 3rd Victim of the Odin Killer. Mikail Ivanovich had an unparalleled work ethic and an unbreakable drive to end corruption. Struck down too soon. <br>May 2419 - June 2460"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/starboard)
|
||||
|
||||
(1,1,1) = {"
|
||||
aaa
|
||||
@@ -101387,7 +101411,7 @@ axP
|
||||
axP
|
||||
aWg
|
||||
aLc
|
||||
aYO
|
||||
cKq
|
||||
baj
|
||||
bbs
|
||||
bcR
|
||||
@@ -103172,7 +103196,7 @@ awa
|
||||
axN
|
||||
azm
|
||||
aAH
|
||||
aCj
|
||||
grp
|
||||
aEc
|
||||
axP
|
||||
aHS
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -19396,6 +19396,19 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/secondary/exit)
|
||||
"NI" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/plaque{
|
||||
desc = "Harley O'Ryan Memorial Hall<br>O'Ryan is memorialized here as the first victim of the Odin Killer. She was always in a good mood. She was brought down before her time. <br>August 2439 - May 2460"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/secondary/entry/fore)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -45995,7 +46008,7 @@ jq
|
||||
pZ
|
||||
kP
|
||||
qv
|
||||
kP
|
||||
NI
|
||||
qO
|
||||
kP
|
||||
rd
|
||||
|
||||
Reference in New Issue
Block a user