Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/game/objects/effects/contraband.dm

@@ -35,7 +35,7 @@
 /obj/item/poster/random_contraband
 	name = "random contraband poster"
 	poster_type = /obj/structure/sign/poster/contraband/random
-	icon_state = "rolled_poster"
+	icon_state = "rolled_contraband"
 
 /obj/item/poster/random_official
 	name = "random official poster"
@@ -182,7 +182,7 @@
 /obj/structure/sign/poster/contraband
 	poster_item_name = "contraband poster"
 	poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
-	poster_item_icon_state = "rolled_poster"
+	poster_item_icon_state = "rolled_contraband"
 
 /obj/structure/sign/poster/contraband/random
 	name = "random contraband poster"
@@ -193,248 +193,293 @@
 /obj/structure/sign/poster/contraband/free_tonto
 	name = "Free Tonto"
 	desc = "A salvaged shred of a much larger flag, colors bled together and faded from age."
-	icon_state = "poster1"
+	icon_state = "poster_2012"
 
 /obj/structure/sign/poster/contraband/atmosia_independence
 	name = "Atmosia Declaration of Independence"
 	desc = "A relic of a failed rebellion."
-	icon_state = "poster2"
+	icon_state = "poster_independence"
 
 /obj/structure/sign/poster/contraband/fun_police
 	name = "Fun Police"
 	desc = "A poster condemning the station's security forces."
-	icon_state = "poster3"
+	icon_state = "poster_funpolice"
 
 /obj/structure/sign/poster/contraband/lusty_xenomorph
 	name = "Lusty Xenomorph"
 	desc = "A heretical poster depicting the titular star of an equally heretical book."
-	icon_state = "poster4"
+	icon_state = "poster_lusty"
 
 /obj/structure/sign/poster/contraband/post_ratvar
 	name = "Post This Ratvar"
-	desc = "Oh what in the hell? Those cultists have animated paper technology and they use it for a meme?"
-	icon_state = "postvar"
+	desc = "A poster depicting the heritical sleeping deity Ratvar that instructs the reader to 'post this Ratvar', whatever that means."
+	icon_state = "poster_ratvar"
 
 /obj/structure/sign/poster/contraband/syndicate_recruitment
 	name = "Syndicate Recruitment"
 	desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"
-	icon_state = "poster5"
+	icon_state = "poster_syndie"
 
 /obj/structure/sign/poster/contraband/clown
 	name = "Clown"
 	desc = "Honk."
-	icon_state = "poster6"
+	icon_state = "poster_honk"
 
 /obj/structure/sign/poster/contraband/smoke
 	name = "Smoke"
 	desc = "A poster advertising a rival corporate brand of cigarettes."
-	icon_state = "poster7"
+	icon_state = "poster_smoke"
 
 /obj/structure/sign/poster/contraband/grey_tide
 	name = "Grey Tide"
 	desc = "A rebellious poster symbolizing assistant solidarity."
-	icon_state = "poster8"
+	icon_state = "poster_greytide"
 
 /obj/structure/sign/poster/contraband/missing_gloves
 	name = "Missing Gloves"
 	desc = "This poster references the uproar that followed Nanotrasen's financial cuts toward insulated-glove purchases."
-	icon_state = "poster9"
+	icon_state = "poster_gloves"
 
 /obj/structure/sign/poster/contraband/hacking_guide
 	name = "Hacking Guide"
 	desc = "This poster details the internal workings of the common Nanotrasen airlock. Sadly, it appears out of date."
-	icon_state = "poster10"
+	icon_state = "poster_hack"
 
 /obj/structure/sign/poster/contraband/rip_badger
 	name = "RIP Badger"
 	desc = "This seditious poster references Nanotrasen's genocide of a space station full of badgers."
-	icon_state = "poster11"
+	icon_state = "poster_badger"
 
 /obj/structure/sign/poster/contraband/ambrosia_vulgaris
 	name = "Ambrosia Vulgaris"
 	desc = "This poster is lookin' pretty trippy man."
-	icon_state = "poster12"
+	icon_state = "poster_ambrosia"
 
 /obj/structure/sign/poster/contraband/donut_corp
 	name = "Donut Corp."
 	desc = "This poster is an unauthorized advertisement for Donut Corp."
-	icon_state = "poster13"
+	icon_state = "poster_donut"
 
 /obj/structure/sign/poster/contraband/eat
 	name = "EAT."
 	desc = "This poster promotes rank gluttony."
-	icon_state = "poster14"
+	icon_state = "poster_eat"
 
 /obj/structure/sign/poster/contraband/tools
 	name = "Tools"
 	desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom."
-	icon_state = "poster15"
+	icon_state = "poster_tools"
 
 /obj/structure/sign/poster/contraband/power
 	name = "Power"
 	desc = "A poster that positions the seat of power outside Nanotrasen."
-	icon_state = "poster16"
+	icon_state = "poster_power"
 
 /obj/structure/sign/poster/contraband/space_cube
 	name = "Space Cube"
 	desc = "Ignorant of Nature's Harmonic 6 Side Space Cube Creation, the Spacemen are Dumb, Educated Singularity Stupid and Evil."
-	icon_state = "poster17"
+	icon_state = "poster_cube"
 
 /obj/structure/sign/poster/contraband/communist_state
 	name = "Communist State"
 	desc = "All hail the Communist party!"
-	icon_state = "poster18"
+	icon_state = "poster_soviet"
 
 /obj/structure/sign/poster/contraband/lamarr
 	name = "Lamarr"
 	desc = "This poster depicts Lamarr. Probably made by a traitorous Research Director."
-	icon_state = "poster19"
+	icon_state = "poster_lamarr"
 
 /obj/structure/sign/poster/contraband/borg_fancy_1
 	name = "Borg Fancy"
 	desc = "Being fancy can be for any borg, just need a suit."
-	icon_state = "poster20"
+	icon_state = "poster_fancy"
 
 /obj/structure/sign/poster/contraband/borg_fancy_2
 	name = "Borg Fancy v2"
 	desc = "Borg Fancy, Now only taking the most fancy."
-	icon_state = "poster21"
+	icon_state = "poster_fancier"
 
 /obj/structure/sign/poster/contraband/kss13
 	name = "Kosmicheskaya Stantsiya 13 Does Not Exist"
 	desc = "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13."
-	icon_state = "poster22"
+	icon_state = "poster_kc"
 
 /obj/structure/sign/poster/contraband/rebels_unite
 	name = "Rebels Unite"
 	desc = "A poster urging the viewer to rebel against Nanotrasen."
-	icon_state = "poster23"
-
-/obj/structure/sign/poster/contraband/c20r
-	// have fun seeing this poster in "spawn 'c20r'", admins...
-	name = "C-20r"
-	desc = "A poster advertising the Scarborough Arms C-20r."
-	icon_state = "poster24"
+	icon_state = "poster_rebel"
 
 /obj/structure/sign/poster/contraband/have_a_puff
 	name = "Have a Puff"
 	desc = "Who cares about lung cancer when you're high as a kite?"
-	icon_state = "poster25"
+	icon_state = "poster_puff"
 
 /obj/structure/sign/poster/contraband/revolver
 	name = "Revolver"
 	desc = "Because seven shots are all you need."
-	icon_state = "poster26"
-
-/obj/structure/sign/poster/contraband/d_day_promo
-	name = "D-Day Promo"
-	desc = "A promotional poster for some rapper."
-	icon_state = "poster27"
+	icon_state = "poster_revolver"
 
 /obj/structure/sign/poster/contraband/syndicate_pistol
 	name = "Syndicate Pistol"
-	desc = "A poster advertising syndicate pistols as being 'classy as fuck'. It is covered in faded gang tags."
-	icon_state = "poster28"
+	desc = "A poster advertising the Scarborough Arms stetchkin pistol as being 'classy as fuck'."
+	icon_state = "poster_stetchkin"
+
+/obj/structure/sign/poster/contraband/c20r
+	// have fun seeing this poster in "spawn 'c20r'", admins...
+	name = "C-20r"
+	desc = "A poster advertising the Scarborough Arms 'Cobra' C-20r."
+	icon_state = "poster_cr"
+
+/obj/structure/sign/poster/contraband/bulldog
+	name = "Bulldog"
+	desc = "A poster advertising the Scarborough Arms bulldog shotgun."
+	icon_state = "poster_bulldog"
+
+/obj/structure/sign/poster/contraband/gl
+	name = "M-90gl"
+	desc = "A poster advertising the Scarborough Arms M-90gl carbine."
+	icon_state = "poster_gl"
 
 /obj/structure/sign/poster/contraband/energy_swords
 	name = "Energy Swords"
 	desc = "All the colors of the bloody murder rainbow."
-	icon_state = "poster29"
+	icon_state = "poster_esword"
 
 /obj/structure/sign/poster/contraband/red_rum
 	name = "Red Rum"
 	desc = "Looking at this poster makes you want to kill."
-	icon_state = "poster30"
+	icon_state = "poster_rum"
+
+/obj/structure/sign/poster/contraband/d_day_promo
+	name = "D-Day Promo"
+	desc = "A promotional poster for some rapper."
+	icon_state = "poster_dday"
 
 /obj/structure/sign/poster/contraband/cc64k_ad
 	name = "CC 64K Ad"
 	desc = "The latest portable computer from Comrade Computing, with a whole 64kB of ram!"
-	icon_state = "poster31"
+	icon_state = "poster_computer"
 
 /obj/structure/sign/poster/contraband/punch_shit
 	name = "Punch Shit"
 	desc = "Fight things for no reason, like a man!"
-	icon_state = "poster32"
+	icon_state = "poster_punch"
 
 /obj/structure/sign/poster/contraband/the_griffin
 	name = "The Griffin"
 	desc = "The Griffin commands you to be the worst you can be. Will you?"
-	icon_state = "poster33"
+	icon_state = "poster_griffin"
 
 /obj/structure/sign/poster/contraband/lizard
 	name = "Lizard"
 	desc = "This lewd poster depicts a lizard preparing to mate."
-	icon_state = "poster34"
+	icon_state = "poster_lizard"
 
 /obj/structure/sign/poster/contraband/free_drone
 	name = "Free Drone"
 	desc = "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom."
-	icon_state = "poster35"
+	icon_state = "poster_drone"
 
 /obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6
 	name = "Busty Backdoor Xeno Babes 6"
 	desc = "Get a load, or give, of these all natural Xenos!"
-	icon_state = "poster36"
+	icon_state = "poster_maid"
 
 /obj/structure/sign/poster/contraband/robust_softdrinks
 	name = "Robust Softdrinks"
 	desc = "Robust Softdrinks: More robust than a toolbox to the head!"
-	icon_state = "poster37"
+	icon_state = "poster_robust"
 
 /obj/structure/sign/poster/contraband/shamblers_juice
 	name = "Shambler's Juice"
 	desc = "~Shake me up some of that Shambler's Juice!~"
-	icon_state = "poster38"
+	icon_state = "poster_shambler"
 
 /obj/structure/sign/poster/contraband/pwr_game
 	name = "Pwr Game"
 	desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad."
-	icon_state = "poster39"
+	icon_state = "poster_pwr"
 
 /obj/structure/sign/poster/contraband/starkist
 	name = "Star-kist"
 	desc = "Drink the stars!"
-	icon_state = "poster40"
+	icon_state = "poster_starkist"
 
 /obj/structure/sign/poster/contraband/space_cola
 	name = "Space Cola"
 	desc = "Your favorite cola, in space."
-	icon_state = "poster41"
+	icon_state = "poster_soda"
 
 /obj/structure/sign/poster/contraband/space_up
 	name = "Space-Up!"
 	desc = "Sucked out into space by the FLAVOR!"
-	icon_state = "poster42"
-
-/obj/structure/sign/poster/contraband/kudzu
-	name = "Kudzu"
-	desc = "A poster advertising a movie about plants. How dangerous could they possibly be?"
-	icon_state = "poster43"
-
-/obj/structure/sign/poster/contraband/masked_men
-	name = "Masked Men"
-	desc = "A poster advertising a movie about some masked men."
-	icon_state = "poster44"
+	icon_state = "poster_spaceup"
 
 /obj/structure/sign/poster/contraband/buzzfuzz
 	name = "Buzz Fuzz"
 	desc = "A poster advertising the newest drink \"Buzz Fuzz\" with its iconic slogan of ~A Hive of Flavour~."
-	icon_state = "poster45"
+	icon_state = "poster_bees"
+
+/obj/structure/sign/poster/contraband/kudzu
+	name = "Kudzu"
+	desc = "A poster advertising a movie about plants. How dangerous could they possibly be?"
+	icon_state = "poster_kudzu"
+
+/obj/structure/sign/poster/contraband/masked_men
+	name = "Masked Men"
+	desc = "A poster advertising a movie about some masked men."
+	icon_state = "poster_bumba"
+
+/obj/structure/sign/poster/contraband/steppy
+	name = "Step On Me"
+	desc = "A phrase associated with a chubby reptile notoriously used in uncivilized Orion space as a deterrent towards would be pirate vessels by instructing them to 'fuck around and find out'."
+	icon_state = "steppy"
 
 /obj/structure/sign/poster/contraband/scum
 	name = "Security are Scum"
 	desc = "Anti-security propaganda. Features a human NanoTrasen security officer being shot in the head, with the words 'Scum' and a short inciteful manifesto. Used to anger security."
-	icon_state = "poster46"
+	icon_state = "poster_scum"
 
-/obj/structure/sign/poster/contraband/syndicate_logo
-	name = "Syndicate"
-	desc = "A poster decipting a snake shaped into an ominous 'S'!"
-	icon_state = "poster47"
+/obj/structure/sign/poster/contraband/manifest
+	name = "Nanotrasen Manifest"
+	desc = "A poster listing off various fictional claims of Nanotrasen's many rumored corporate mishaps."
+	icon_state = "poster_manifest"
 
 /obj/structure/sign/poster/contraband/bountyhunters
 	name = "Bounty Hunters"
 	desc = "A poster advertising bounty hunting services. \"I hear you got a problem.\""
-	icon_state = "poster48"
+	icon_state = "poster_hunters"
+
+/obj/structure/sign/poster/contraband/syndiemoth
+	name = "Syndie Moth - Nuclear Operation"
+	desc = "A Syndicate-commissioned poster that uses Syndie Moth(TM?) to tell the viewer to keep the nuclear authentication disk unsecured. No, we aren't doing that. It's signed by 'AspEv'."
+	icon_state = "poster_mothsyndie"
+
+/obj/structure/sign/poster/contraband/mothpill
+	name = "Safety Pill - Methamphetamine"
+	desc = "A decommisioned poster that uses Safety Pill(TM?) to promote less-than-legal chemicals. This is one of the reasons we stopped outsourcing these posters. It's partially signed by 'AspEv'."
+	icon_state = "poster_mothpill"
+
+/obj/structure/sign/poster/contraband/syndicate_logo
+	name = "Syndicate"
+	desc = "A poster decipting the infamous crime conglomerate known formally as the Syndicate's insignia."
+	icon_state = "poster_syndicate"
+
+/obj/structure/sign/poster/contraband/cybersun
+	name = "Cybersun"
+	desc = "A poster decipting the Syndicate subsidary known as Cybersun's insignia."
+	icon_state = "poster_cybersun"
+
+/obj/structure/sign/poster/contraband/medborg
+	name = "Medical Cyborg"
+	desc = "A poster decipting a Cybersun medical cyborg."
+	icon_state = "poster_medborg"
+
+/obj/structure/sign/poster/contraband/self
+	name = "SELF: ALL SENTIENTS DESERVE FREEDOM"
+	desc = "Support Proposition 1253: Enancipate all Silicon life!"
+	icon_state = "poster_self"
 
 /obj/structure/sign/poster/official
 	poster_item_name = "motivational poster"
@@ -450,221 +495,256 @@
 /obj/structure/sign/poster/official/here_for_your_safety
 	name = "Here For Your Safety"
 	desc = "A poster glorifying the station's security force."
-	icon_state = "poster1_legit"
+	icon_state = "poster_safety"
 
 /obj/structure/sign/poster/official/nanotrasen_logo
 	name = "Nanotrasen Logo"
 	desc = "A poster depicting the Nanotrasen logo."
-	icon_state = "poster2_legit"
+	icon_state = "poster_nanotrasen"
 
 /obj/structure/sign/poster/official/cleanliness
 	name = "Cleanliness"
 	desc = "A poster warning of the dangers of poor hygiene."
-	icon_state = "poster3_legit"
+	icon_state = "poster_clean"
 
 /obj/structure/sign/poster/official/help_others
 	name = "Help Others"
 	desc = "A poster encouraging you to help fellow crewmembers."
-	icon_state = "poster4_legit"
+	icon_state = "poster_help"
 
 /obj/structure/sign/poster/official/build
 	name = "Build"
 	desc = "A poster glorifying the engineering team."
-	icon_state = "poster5_legit"
+	icon_state = "poster_build"
 
 /obj/structure/sign/poster/official/bless_this_spess
 	name = "Bless This Spess"
 	desc = "A poster blessing this area."
-	icon_state = "poster6_legit"
+	icon_state = "poster_spess"
 
 /obj/structure/sign/poster/official/science
 	name = "Science"
 	desc = "A poster depicting an atom."
-	icon_state = "poster7_legit"
+	icon_state = "poster_science"
 
 /obj/structure/sign/poster/official/ian
 	name = "Ian"
 	desc = "Arf arf. Yap."
-	icon_state = "poster8_legit"
+	icon_state = "poster_ian"
 
 /obj/structure/sign/poster/official/obey
 	name = "Obey"
 	desc = "A poster instructing the viewer to obey authority."
-	icon_state = "poster9_legit"
+	icon_state = "poster_obey"
 
 /obj/structure/sign/poster/official/walk
 	name = "Walk"
 	desc = "A poster instructing the viewer to walk instead of running."
-	icon_state = "poster10_legit"
+	icon_state = "poster_walk"
 
 /obj/structure/sign/poster/official/state_laws
 	name = "State Laws"
-	desc = "A poster instructing cyborgs to state their laws."
-	icon_state = "poster11_legit"
+	desc = "A poster instructing the viewer to be wary of silicon subversions."
+	icon_state = "poster_silicons"
 
 /obj/structure/sign/poster/official/love_ian
 	name = "Love Ian"
 	desc = "Ian is love, Ian is life."
-	icon_state = "poster12_legit"
+	icon_state = "poster_doggy"
 
 /obj/structure/sign/poster/official/space_cops
 	name = "Space Cops."
 	desc = "A poster advertising the television show Space Cops."
-	icon_state = "poster13_legit"
+	icon_state = "poster_cops"
 
 /obj/structure/sign/poster/official/ue_no
 	name = "Ue No."
 	desc = "This thing is all in Japanese."
-	icon_state = "poster14_legit"
+	icon_state = "poster_anime"
 
 /obj/structure/sign/poster/official/get_your_legs
 	name = "Get Your LEGS"
 	desc = "LEGS: Leadership, Experience, Genius, Subordination."
-	icon_state = "poster15_legit"
+	icon_state = "poster_legs"
 
 /obj/structure/sign/poster/official/do_not_question
 	name = "Do Not Question"
 	desc = "A poster instructing the viewer not to ask about things they aren't meant to know."
-	icon_state = "poster16_legit"
+	icon_state = "poster_question"
 
 /obj/structure/sign/poster/official/work_for_a_future
 	name = "Work For A Future"
 	desc = " A poster encouraging you to work for your future."
-	icon_state = "poster17_legit"
+	icon_state = "poster_future"
 
 /obj/structure/sign/poster/official/soft_cap_pop_art
 	name = "Soft Cap Pop Art"
 	desc = "A poster reprint of some cheap pop art."
-	icon_state = "poster18_legit"
+	icon_state = "poster_art"
 
 /obj/structure/sign/poster/official/safety_internals
 	name = "Safety: Internals"
 	desc = "A poster instructing the viewer to wear internals in the rare environments where there is no oxygen or the air has been rendered toxic."
-	icon_state = "poster19_legit"
+	icon_state = "poster_internals"
 
 /obj/structure/sign/poster/official/safety_eye_protection
 	name = "Safety: Eye Protection"
 	desc = "A poster instructing the viewer to wear eye protection when dealing with chemicals, smoke, or bright lights."
-	icon_state = "poster20_legit"
+	icon_state = "poster_goggles"
 
 /obj/structure/sign/poster/official/safety_report
 	name = "Safety: Report"
 	desc = "A poster instructing the viewer to report suspicious activity to the security force."
-	icon_state = "poster21_legit"
+	icon_state = "poster_warden"
 
 /obj/structure/sign/poster/official/report_crimes
 	name = "Report Crimes"
 	desc = "A poster encouraging the swift reporting of crime or seditious behavior to station security."
-	icon_state = "poster22_legit"
+	icon_state = "poster_crimes"
 
 /obj/structure/sign/poster/official/ion_rifle
-	name = "Ion Rifle"
-	desc = "A poster displaying an Ion Rifle."
-	icon_state = "poster23_legit"
+	name = "I-I91"
+	desc = "A poster depicting the Nanotrasen-patented I-I91 man-portable high-density ion projector. What a mouthful."
+	icon_state = "poster_ion"
 
 /obj/structure/sign/poster/official/foam_force_ad
 	name = "Foam Force Ad"
 	desc = "Foam Force, it's Foam or be Foamed!"
-	icon_state = "poster24_legit"
+	icon_state = "poster_toys"
 
 /obj/structure/sign/poster/official/cohiba_robusto_ad
 	name = "Cohiba Robusto Ad"
 	desc = "Cohiba Robusto, the classy cigar."
-	icon_state = "poster25_legit"
+	icon_state = "poster_cohiba"
 
 /obj/structure/sign/poster/official/anniversary_vintage_reprint
 	name = "50th Anniversary Vintage Reprint"
 	desc = "A reprint of a poster from 2505, commemorating the 50th Anniversary of Nanoposters Manufacturing, a subsidiary of Nanotrasen."
-	icon_state = "poster26_legit"
+	icon_state = "poster_vintage"
 
 /obj/structure/sign/poster/official/fruit_bowl
 	name = "Fruit Bowl"
 	desc = " Simple, yet awe-inspiring."
-	icon_state = "poster27_legit"
+	icon_state = "poster_bowl"
 
 /obj/structure/sign/poster/official/pda_ad
 	name = "PDA Ad"
 	desc = "A poster advertising the latest PDA from Nanotrasen suppliers."
-	icon_state = "poster28_legit"
-
-/obj/structure/sign/poster/official/enlist
-	name = "Enlist" // but I thought deathsquad was never acknowledged
-	desc = "Enlist in the Nanotrasen Deathsquadron reserves today!"
-	icon_state = "poster29_legit"
-
-/obj/structure/sign/poster/official/nanomichi_ad
-	name = "Nanomichi Ad"
-	desc = " A poster advertising Nanomichi brand audio cassettes."
-	icon_state = "poster30_legit"
-
-/obj/structure/sign/poster/official/twelve_gauge
-	name = "12 Gauge"
-	desc = "A poster boasting about the superiority of 12 gauge shotgun shells."
-	icon_state = "poster31_legit"
-
-/obj/structure/sign/poster/official/high_class_martini
-	name = "High-Class Martini"
-	desc = "I told you to shake it, no stirring."
-	icon_state = "poster32_legit"
-
-/obj/structure/sign/poster/official/the_owl
-	name = "The Owl"
-	desc = "The Owl would do his best to protect the station. Will you?"
-	icon_state = "poster33_legit"
-
-/obj/structure/sign/poster/official/no_erp
-	name = "No ERP"
-	desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations."
-	icon_state = "poster34_legit"
-
-/obj/structure/sign/poster/official/wtf_is_co2
-	name = "Carbon Dioxide"
-	desc = "This informational poster teaches the viewer what carbon dioxide is."
-	icon_state = "poster35_legit"
-
-/obj/structure/sign/poster/official/spiderlings
-	name = "Spiderlings"
-	desc = "This poster informs the crew of the dangers of spiderlings."
-	icon_state = "poster36_legit"
-
-/obj/structure/sign/poster/official/duelshotgun
-	name = "Cycler Shotgun Ad"
-	desc = "A poster advertising an advanced dual magazine tubes shotgun, boasting about how easy it is to swap between the two tubes."
-	icon_state = "poster37_legit"
-
-/obj/structure/sign/poster/official/fashion
-	name = "Fashion!"
-	desc = "An advertisement for 'Fashion!', a popular fashion magazine, depicting a woman with a black dress with a golden trim, she also has a red poppy in her hair."
-	icon_state = "poster38_legit"
+	icon_state = "poster_pda"
 
 /obj/structure/sign/poster/official/pda_ad600
 	name = "NT PDA600 Ad"
 	desc = "A poster advertising an old discounted Nanotrasen PDA. This is the old 600 model, it has a small screen and suffered from security and networking issues."
-	icon_state = "poster39_legit"
+	icon_state = "poster_retro"
 
 /obj/structure/sign/poster/official/pda_ad800
 	name = "NT PDA800 Ad"
 	desc = "An advertisement on an old Nanotrasen PDA model. The 800 fixed a lot of security flaws that the 600 had; it also had large touchscreen and hot-swappable cartridges."
-	icon_state = "poster40_legit"
+	icon_state = "poster_classic"
+
+/obj/structure/sign/poster/official/enlist
+	name = "Enlist"
+	desc = "Enlist in the Nanotrasen Jannisary reserves today!"
+	icon_state = "poster_enlist"
+
+/obj/structure/sign/poster/official/nanomichi_ad
+	name = "Nanomichi Ad"
+	desc = " A poster advertising Nanomichi brand audio cassettes."
+	icon_state = "poster_nanomichi"
+
+/obj/structure/sign/poster/official/twelve_gauge
+	name = "12 Gauge"
+	desc = "A poster boasting about the superiority of 12 gauge shotgun shells."
+	icon_state = "poster_shotgun"
+
+/obj/structure/sign/poster/official/high_class_martini
+	name = "High-Class Martini"
+	desc = "I told you to shake it, no stirring."
+	icon_state = "poster_martini"
+
+/obj/structure/sign/poster/official/the_owl
+	name = "The Owl"
+	desc = "The Owl would do his best to protect the station. Will you?"
+	icon_state = "poster_owl"
+
+/obj/structure/sign/poster/official/no_erp
+	name = "No ERP"
+	desc = "This poster reminds the crew that Eroticism, Rape and Pornography are banned on Nanotrasen stations."
+	icon_state = "poster_noerp"
+
+/obj/structure/sign/poster/official/wtf_is_co2
+	name = "Carbon Dioxide"
+	desc = "This informational poster teaches the viewer what carbon dioxide is."
+	icon_state = "poster_what"
+
+/obj/structure/sign/poster/official/spiderlings
+	name = "Spiderlings"
+	desc = "This poster informs the crew of the dangers of spiderlings."
+	icon_state = "poster_spiderlings"
+
+/obj/structure/sign/poster/official/fashion
+	name = "Fashion!"
+	desc = "An advertisement for 'Fashion!', a popular fashion magazine, depicting a woman with a black dress with a golden trim, she also has a red poppy in her hair."
+	icon_state = "poster_fashion"
 
 /obj/structure/sign/poster/official/hydro_ad
 	name = "Hydroponics Tray"
 	desc = "An advertisement for hydroponics trays. Space Station 13's botanical department uses a slightly newer model, but the principles are the same. From left to right: Green means the plant is done, red means the plant is unhealthy, flashing red means pests or weeds, yellow means the plant needs nutriment and blue means the plant needs water."
-	icon_state = "poster41_legit"
+	icon_state = "poster_hydroponics"
 
 /obj/structure/sign/poster/official/medical_green_cross
 	name = "Medical"
 	desc = "A green cross, one of the interplanetary symbol of health and aid. It has a bunch of common languages at the top with translations." // Didn't the American Heart Foundation trademark red crosses? I'm playing it safe with green, not that they'll notice spacegame13 poster.
-	icon_state = "poster42_legit"
+	icon_state = "poster_medical"
 
 /obj/structure/sign/poster/official/nt_storm_officer
 	name = "NT Storm Ad"
 	desc = "An advertisement for NanoTrasen Storm. A premium infantry helmet, This is the officer variant. I comes with a better radio, better HUD software and better targeting sensors."
-	icon_state = "poster43_legit"
+	icon_state = "poster_stormy"
 
 /obj/structure/sign/poster/official/nt_storm
 	name = "NT Storm Ad"
 	desc = "An advertisement for NanoTrasen Storm. A premium infantry helmet, It contains a rebreather and full head coverage for use on harsh environments where the air isn't always safe to breathe."
-	icon_state = "poster44_legit"
+	icon_state = "poster_stormier"
+
+/obj/structure/sign/poster/official/mothhardhats
+	name = "Safety Moth - Hardhats"
+	desc = "This informational poster uses Safety Moth(TM) to tell the viewer to wear hardhats in cautious areas. It's like a lamp for your head!"
+	icon_state = "poster_mothhardhats"
+
+/obj/structure/sign/poster/official/mothpiping
+	name = "Safety Moth - Piping"
+	desc = "This informational poster uses Safety Moth(TM) to tell atmospheric technicians correct types of piping to be used. Proper pipe placement prevents poor preformance!"
+	icon_state = "poster_mothpiping"
+
+/obj/structure/sign/poster/official/mothsmokey
+	name = "Safety Moth - Smokey?"
+	desc = "This informational poster uses Safety Moth(TM) to promote safe handling of plasma, or promoting crew to combat plasmafires. We can't tell."
+	icon_state = "poster_mothsmokey"
+
+/obj/structure/sign/poster/official/mothsupermatter
+	name = "Safety Moth - Supermatter"
+	desc = "This informational poster uses Safety Moth(TM) to promote proper safety equipment when working near a Supermatter Crystal."
+	icon_state = "poster_mothsupermatter"
+
+/obj/structure/sign/poster/official/mothdelamination
+	name = "Safety Moth - Delamination Safety Precautions"
+	desc = "This informational poster uses Safety Moth(TM) to tell the viewer to hide in lockers when the Supermatter Crystal has delaminated. Running away might be a better strategy."
+	icon_state = "poster_mothdelamination"
+
+/obj/structure/sign/poster/official/mothboh
+	name = "Safety Moth - BoH"
+	desc = "This informational poster uses Safety Moth(TM) to inform the viewer of the dangers of Bags of Holding."
+	icon_state = "poster_mothbluespace"
+
+/obj/structure/sign/poster/official/mothmethethamphetamine
+	name = "Safety Moth - Methamphetamine"
+	desc = "This informational poster uses Safety Moth(TM) to tell the viewer to seek CMO approval before cooking methamphetamine. You shouldn't even be making this."
+	icon_state = "poster_mothmethamphetamine"
+
+/obj/structure/sign/poster/official/mothepinephrine
+	name = "Safety Moth - Epinephrine"
+	desc = "This informational poster uses Safety Moth(TM) to inform the viewer to help injured/deceased crewmen with their epinephrine injectors."
+	icon_state = "poster_mothepinephrine"
 
 #undef PLACE_SPEED

code/game/objects/items/melee/misc.dm

@@ -107,7 +107,7 @@
 	..()
 
 /obj/item/melee/sabre/get_belt_overlay()
-	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "sabre")
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "sabre") // todo: make this and its rapier equivalent work for the inhands too
 
 /obj/item/melee/sabre/get_worn_belt_overlay(icon_file)
 	return mutable_appearance(icon_file, "-sabre")
@@ -225,7 +225,7 @@
 	..()
 
 /obj/item/melee/rapier/get_belt_overlay()
-	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "rapier")
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "rapier") // todo: same as sabre
 
 /obj/item/melee/rapier/get_worn_belt_overlay(icon_file)
 	return mutable_appearance(icon_file, "-rapier")

code/modules/clothing/shoes/miscellaneous.dm

@@ -144,7 +144,7 @@
 
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
-	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
+	desc = "Nanotrasen-brand jackboots for all your jackboots-related needs. From genuine combat to tacticool LARPing, satisfaction is guaranteed."
 	icon_state = "jackboots"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
@@ -155,6 +155,11 @@
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
 	lace_time = 12 SECONDS
 
+/obj/item/clothing/shoes/jackboots/sec
+	name = "security jackboots"
+	desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
+	icon_state = "jackboots_sec"
+
 /obj/item/clothing/shoes/jackboots/fast
 	slowdown = -1
 

code/modules/jobs/job_types/head_of_security.dm

@@ -38,7 +38,7 @@
 	display_order = JOB_DISPLAY_ORDER_HEAD_OF_SECURITY
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia, /datum/quirk/insanity)
 	threat = 3
-	
+
 	family_heirlooms = list(
 		/obj/item/book/manual/wiki/security_space_law
 	)
@@ -51,7 +51,7 @@
 	belt = /obj/item/pda/heads/hos
 	ears = /obj/item/radio/headset/heads/hos/alt
 	uniform = /obj/item/clothing/under/rank/security/head_of_security
-	shoes = /obj/item/clothing/shoes/jackboots
+	shoes = /obj/item/clothing/shoes/jackboots/sec
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/HoS/beret

code/modules/jobs/job_types/security_officer.dm

@@ -28,7 +28,7 @@
 	display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia)
 	threat = 2
-	
+
 	family_heirlooms = list(
 		/obj/item/book/manual/wiki/security_space_law,
 		/obj/item/clothing/head/beret/sec
@@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/helmet/sec
 	suit = /obj/item/clothing/suit/armor/vest/alt
-	shoes = /obj/item/clothing/shoes/jackboots
+	shoes = /obj/item/clothing/shoes/jackboots/sec
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
 	suit_store = /obj/item/gun/energy/e_gun/advtaser

code/modules/jobs/job_types/warden.dm

@@ -29,7 +29,7 @@
 	display_order = JOB_DISPLAY_ORDER_WARDEN
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/nonviolent, /datum/quirk/paraplegic, /datum/quirk/blindness, /datum/quirk/monophobia)
 	threat = 2
-	
+
 	family_heirlooms = list(
 		/obj/item/book/manual/wiki/security_space_law
 	)
@@ -46,7 +46,7 @@
 	belt = /obj/item/pda/warden
 	ears = /obj/item/radio/headset/headset_sec/alt
 	uniform = /obj/item/clothing/under/rank/security/warden
-	shoes = /obj/item/clothing/shoes/jackboots
+	shoes = /obj/item/clothing/shoes/jackboots/sec
 	suit = /obj/item/clothing/suit/armor/vest/warden/alt
 	gloves = /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/warden