deco stuff (#8667)

* deco

* Thalar not credits

* adjustments

* indent

* The linter does not like Latin Small Letter O With Diaeresis

* hopefully it will work now
This commit is contained in:
Greenjoe12345
2022-07-24 19:16:14 -08:00
committed by GitHub
parent ca13a81141
commit de1377c1da
15 changed files with 700 additions and 57 deletions
@@ -660,3 +660,33 @@
name = "Chat With Sally"
desc = "A poster depicting a familiar face readying to slurp a big mug of coffee. Thanks to a partnership with Kaleidoscope Cosmetics, the latest incarnation of Vir's 'Sally' chat-show host comes with the latest in cosmetic gene-mods! Or not, she's a drone."
listing_name = "Ad - Chat With Sally"
/decl/poster/nanotrasen/pol_11
icon_state = "tgposter63"
name = "Phoron and the body"
desc = "This informational poster provides information on the effects of Phoron exposure, and what you should do if exposed to Phoron."
listing_name = "Safety - Phoron and the body"
/decl/poster/pol_17
icon_state = "tgposter64"
name = "Periodic Table of the Elements"
desc = "It is displaying the periodic table of the elements, from Hydrogen to Oganesson, and everything inbetween."
listing_name = "Info - Periodic Table"
/decl/poster/pol_18
icon_state = "tgposter65"
name = "Shop-N-Large Supermarkets"
desc = "An advertisement for Shop-N-Large supermarkets, advertising their new Stop-N-Shop locations as part of their partnership with Nanotrasen."
listing_name = "Ad - Stop-N-Shop"
/decl/poster/pol_19
icon_state = "tgposter66"
name = "Midtown Slice Pizza"
desc = "An advertisement for Midtown Slice Pizza, a subsidiary of Nanotrasen. Midtown Slice: like a slice of home, no matter where you are."
listing_name = "Ad - Midtown Pizza"
/decl/poster/pol_20
icon_state = "tgposter67"
name = "Jim Norton's Coffee"
desc = "An advertisement for Jim Norton's, the coffee joint that's taken the galaxy by storm."
listing_name = "Ad - Jim Norton Coffee"
@@ -3,7 +3,7 @@
if(exact)
return decls_repository.get_decl(path)
else
var/list/L = decls_repository.get_decls_of_type(path)
var/list/L = decls_repository.get_decls_of_type(path)
return L[pick(L)]
return null
@@ -27,7 +27,7 @@
src.poster_decl = get_poster_decl(poster_decl, TRUE)
else
src.poster_decl = get_poster_decl(/decl/poster, FALSE)
name += " - [src.poster_decl.name]"
return ..()
@@ -58,8 +58,8 @@
if (locate(/obj/structure/sign/poster) in T)
stuff_on_wall = 1
break
if(stuff_on_wall)
if(stuff_on_wall)
to_chat(user, "<span class='notice'>There is already a poster there!</span>")
return FALSE
@@ -71,7 +71,7 @@
to_chat(user, "<span class='notice'>You place the poster!</span>")
qdel(src)
return TRUE
P.roll_and_drop(P.loc)
qdel(src)
return FALSE
@@ -155,7 +155,7 @@
else if(ispath(P))
src.poster_decl = get_poster_decl(P, TRUE)
else
src.poster_decl = get_poster_decl(target_poster_decl_path, FALSE)
src.poster_decl = get_poster_decl(target_poster_decl_path, FALSE)
name = "[initial(name)] - [poster_decl.name]"
desc = "[initial(desc)] [poster_decl.desc]"
+54 -1
View File
@@ -1433,4 +1433,57 @@
/obj/structure/balloon/ghost
name = "giant ghost balloon"
desc = "Oh no, it's a ghost! Oh wait, it's just a balloon. Phew!"
icon_state = "ghostballoon"
icon_state = "ghostballoon"
//ship models
/obj/item/toy/modelship
name = "Model ship"
desc = "A model of a SolGov ship, in 1:250th scale, on a handsome wooden stand. Small lights blink on the hull and at the engine exhaust."
icon_state = "ship_model_1"
icon = 'icons/obj/toy.dmi'
/obj/item/toy/modelship/two
desc = "A small model of a spaceship, in 1:278th scale, it has small lights iluminating it's windows and engines."
icon_state = "ship_model_2"
//desk toys
/obj/item/toy/desk
name = "desk toy master"
desc = "A object that does not exist. Parent Item"
icon = 'icons/obj/toy.dmi'
var/on = 0
var/activation_sound = 'sound/weapons/empty.ogg'
/obj/item/toy/desk/update_icon()
if(on)
icon_state = "[initial(icon_state)]-on"
else
icon_state = "[initial(icon_state)]"
/obj/item/toy/desk/attack_self(mob/user)
on = !on
if(on && activation_sound)
playsound(src.loc, activation_sound, 15, 1, -3)
update_icon()
return 1
/obj/item/toy/desk/newtoncradle
name = "\improper Newton's cradle"
desc = "An ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space."
icon_state = "newtoncradle"
/obj/item/toy/desk/fan
name = "desk fan"
desc = "Your greatest fan."
icon_state= "fan"
/obj/item/toy/desk/officetoy
name = "office toy"
desc = "A generic microfusion powered office desk toy. Only generates magnetism and ennui."
icon_state= "desktoy"
/obj/item/toy/desk/dippingbird
name = "dipping bird toy"
desc = "An ancient human bird idol, worshipped by clerks and desk jockeys."
icon_state= "dippybird"
@@ -0,0 +1,54 @@
/obj/structure/prop/billboard
name = "billboard"
desc = "A large advertisement board, this one is blank"
icon = 'icons/obj/props/billboard.dmi'
icon_state = "billboard_blank"
bound_width = 96
bound_height = 64
/obj/structure/prop/billboard/donkburger
name = "\improper Donk-n-Go billboard"
desc = "A billboard advertising Donk-n-Go, Donk Co's ever-present and ever-unhealthy fast-food venture: GET IN, GET FED, GET GONE!"
icon_state = "billboard_donk_n_go"
/obj/structure/prop/billboard/space_cola
name = "\improper Space Cola billboard"
desc = "A billboard advertising Space Cola: Relax, have a Spoke."
icon_state = "billboard_space_cola"
/obj/structure/prop/billboard/NT
name = "\improper NanoTrasen billboard"
desc = "A billboard advertising NanoTrasen: A Better Tomorrow, Today."
icon_state = "billboard_nanotrasen"
/obj/structure/prop/billboard/NT/defaced
name = "defaced NanoTrasen billboard"
desc = "A billboard advertising Nanotrasen. Someone's sprayed a message onto it: Fuck Corpo Pigs."
icon_state = "billboard_fuck_corps"
/obj/structure/prop/billboard/azik
name = "\improper Azik Interstellar billboard"
desc = "A billboard advertising Azik Interstellar and their newest model: the Autocrat Solar Sailer. Azik Interstellar: Tau Cetian Refinement for Galactic Necessities."
icon_state = "billboard_azik"
description_fluff = "Azik Interstellar is a subsidiary of Wulf Aeronautics, producing smaller spacecraft for private civillian use."
/obj/structure/prop/billboard/cvr
name = "\improper Charlemagne von Rheinland billboard"
desc = "A billboard advertising Charlemagne von Rheinland's Germania-class superyacht. Charlemagne von Rheinland: Die Werft der Könige."
icon_state = "billboard_cvr"
description_fluff = "The Germania-class superyacht is a type of luxury vessel, built by Wulf Aeronautics and furnished by a subsidiary of Gilthari Exports."
/obj/structure/prop/billboard/shop_n_large
name = "\improper Shop-N-Large billboard"
desc = "A billboard advertising Shop-N-Large's new range of limited-edition Ice Slush flavours. Shop-N-Large: The products you want for great prices."
icon_state = "billboard_shop_n_large"
/obj/structure/prop/billboard/starway
name = "\improper Starway Transit billboard"
desc = "A billboard advertising Starway Transit's direct flight from Kalmar to New York: only 2000 Thaler for an economy class berth. Starway: Your Ticket to the Stars. Interstellar travel prices haven't been this low since before the Incursion..."
icon_state = "billboard_starway"
/obj/structure/prop/billboard/smoothies
name = "\improper Spinward Smoothies billboard"
desc = "A billboard advertising Spinward Smoothies. "
icon_state = "billboard_smoothies"
+39 -1
View File
@@ -31,6 +31,7 @@
//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
//S.icon = I.Scale(24, 24)
S.sign_state = icon_state
S.original_type = type
qdel(src)
else ..()
@@ -40,12 +41,14 @@
icon = 'icons/obj/decals.dmi'
w_class = ITEMSIZE_NORMAL //big
var/sign_state = ""
var/original_type
/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
if(tool.is_screwdriver() && isturf(user.loc))
var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
if(direction == "Cancel") return
var/obj/structure/sign/S = new(user.loc)
var/target_type = original_type || /obj/structure/sign
var/obj/structure/sign/S = new target_type(user.loc)
switch(direction)
if("North")
S.pixel_y = 32
@@ -123,6 +126,11 @@
desc = "A warning sign which reads 'NO SMOKING'."
icon_state = "nosmoking2"
/obj/structure/sign/nosmoking_2/burnt
name = "\improper NO SMOKING"
desc = "A warning sign which reads 'NO SMOKING'. It looks like someone didn't follow its advice..."
icon_state = "nosmoking2_burnt"
/obj/structure/sign/warning
name = "\improper WARNING"
icon_state = "securearea"
@@ -1111,3 +1119,33 @@
/obj/structure/sign/bigname/seg_7
icon_state = "cyno_7"
/obj/structure/sign/clock
name = "wall clock"
desc = "A basic wall clock, synced to the current system time."
icon_state = "clock"
/obj/structure/sign/clock/examine(mob/user)
. = ..()
. += "The clock shows that the time is [stationtime2text()]."
/obj/structure/sign/calendar
name = "calendar"
desc = "It's an old-school, NanoTrasen branded wall calendar. Sure, it might be obsolete with modern technology, but it's still hard to imagine an office without one."
icon_state = "calendar"
/obj/structure/sign/calendar/examine(mob/user)
. = ..()
. += "The calendar shows that the date is [stationdate2text()]."
if (Holiday.len)
. += "Today is <strong><span class='green'>[english_list(Holiday)]</span></strong>."
/obj/structure/sign/explosive
name = "\improper HIGH EXPLOSIVES sign"
desc = "A warning sign which reads 'HIGH EXPLOSIVES'."
icon_state = "explosives"
/obj/structure/sign/chemdiamond
name = "\improper HAZARDOUS CHEMICALS sign"
desc = "A sign that warns of potentially hazardous chemicals nearby, indicating health risk, flash point, and reactivity."
icon_state = "chemdiamond"