diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 6096c2deb90..5a601671616 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -100,7 +100,7 @@ name = "Marshal bulletin board" desc = "A board containing vital notices and official memos for Marshal Officers." icon_state = "nboard03" - notices = 7 + notices = 3 /obj/structure/noticeboard/marshal/New() //add some memos, make sure to break them up so it's relatively readable in code! @@ -165,25 +165,12 @@ P.stamped &= STAMP_FACTION src.contents += P - P = new() - P.name = "Wanted:Liam Wright" - P.info = "

Nadezhda Colonial Security

\ -

Latest wanted issues

\ -
\ -
\ - NAME: Liam Wright
\ - DESCRIPTION:Pale, thin, male vat-grown. Short, black hair
\ - CRIMES:Sabotage, Infiltration, possession of excelsior contraband, threat of murder or serious injury, conspiracy to commit grand tresspass, sparking manhunt.
\ - NOTES:A long veteran foreman of the Prospectors and a known Psion. Suspect should be assumed armed and dangerous at all times and is wanted alive. Militia personnel are advised to not engage alone." - P.copy_overlays(list("paper_stamp-dots"), TRUE) - P.stamped &= STAMP_FACTION - src.contents += P /obj/structure/noticeboard/blackshield name = "Blackshield bulletin board" desc = "A board containing vital notices and official memos for the Blackshield Militia" icon_state = "nboard02" - notices = 5 + notices = 2 /obj/structure/noticeboard/blackshield/New() var/obj/item/paper/P = new() @@ -230,22 +217,6 @@ P.stamped &= STAMP_FACTION src.contents += P - P = new() - P.name = "Wanted:Liam Wright" - P.info = "

Nadezhda Colonial Security

\ -

Latest wanted issues

\ -
\ -
\ - NAME: Liam Wright
\ - DESCRIPTION:Pale, thin, male vat-grown. Short, black hair
\ - CRIMES:Sabotage, Infiltration, possession of excelsior contraband, threat of murder or serious injury, conspiracy to commit grand tresspass, sparking manhunt.
\ - NOTES:A long veteran foreman of the Prospectors and a known Psion. Suspect should be assumed armed and dangerous at all times and is wanted alive. Militia personnel are advised to not engage alone." - P.copy_overlays(list("paper_stamp-dots"), TRUE) - P.stamped &= STAMP_FACTION - src.contents += P - - - /obj/structure/noticeboard/medical name = "Medical bulletin board" desc = "A board containing vital notices and official memos for Soteria Medical" @@ -356,4 +327,4 @@ P.S -

Don't leave the drills running unattended!

" P.stamped &= STAMP_FACTION src.contents += P */ -#undef MAX_NOTICES +#undef MAX_NOTICES \ No newline at end of file diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 1d1be7c84bd..b4703e457da 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/news_articles/wanted_issue_wright.html b/news_articles/wanted_issue_wright.html deleted file mode 100644 index 472eb5cc5ab..00000000000 --- a/news_articles/wanted_issue_wright.html +++ /dev/null @@ -1,10 +0,0 @@ -

Nadezhda Colonial Security

-

Latest wanted issues

-
-
-
The logo of the Nadezhda Marshals flashes briefly on the screen

-
- NAME: Liam Writh
- DESCRIPTION:Pale, thin, male vat-grown. Short, black hair
- CRIMES:Sabotage, Infiltration, possession of excelsior contraband, threat of murder or serious injury, conspiracy to commit grand tresspass, sparking manhunt.
- NOTES:A long veteran foreman of the Prospectors and a known Psion. Suspect should be assumed armed and dangerous at all times and is wanted alive. Militia personnel are advised to not engage alone.