Commit Graph

2828 Commits

Author SHA1 Message Date
SkyratBot
4440140319 [MIRROR] The CE can now buy the BYOS (#5079)
* The CE can now buy the BYOS (#58389)

* The CE can now buy the BYOS

* aaa

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-22 01:27:04 +01:00
SkyratBot
4bb11934b8 [MIRROR] Vote Panel Fixes: Allows Player Votes, Vertical Rendering for Voting List (#5020)
* Vote Panel Fixes: Allows Player Votes, Vertical Rendering for Voting List (#58489)

* Updated permissions

* tfw prettier

* Fixed Issue

* Vote Panel Fixes: Allows Player Votes, Vertical Rendering for Voting List

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
2021-04-19 03:51:33 +01:00
Gandalf
f136e49b88 Actually fixes mining maps lol (#4968)
* Update mining_maps.dm

* Update mining_maps.dm

* a

* aaa

* aaaa

* Update mining_maps.dm

* aaaaa
2021-04-17 15:52:34 +01:00
Gandalf
bdb53b684b FFFFFFFFFFF 2021-04-16 23:38:00 +01:00
Gandalf
c7e7a0ef50 Whoops (#4961)
* aaaa

* AAAAAAAAAAAAAAAAAA

* 0..

* Update mapping.dm

* Update Rockplanet.dmm

* AAAAAAAAAAAAA

* Update Vote.js

* aaaa
2021-04-16 23:29:43 +01:00
Gandalf
73a45dea8e Random mining! [DOWNSTREAM IMPORTANCE LEVEL 1] (#4957)
* aaaa

* AAAAAAAAAAAAAAAAAA

* 0..

* Update mapping.dm

* Update Rockplanet.dmm
2021-04-17 00:19:58 +02:00
SkyratBot
a08d398675 [MIRROR] Renews Maintenance Drones (#4868)
* Renews Maintenance Drones

* And these have conflicts too, but you can't see them

* Skyrat Map Updates (Adding Supermatter Room Area)

Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-04-16 13:04:21 +02:00
SkyratBot
acdbc8a6c4 [MIRROR] Makes the GAS system only update the icon when it has changed (#4924)
* Makes the GAS system only update the icon when it has changed (#58337)

* Makes the GAS system only update the icon when it has changed

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-15 16:22:45 +01:00
Funce
1e53efe37c No more discord spam (#4926) 2021-04-15 14:18:29 +01:00
SkyratBot
84aa664b58 [MIRROR] Fix overlay subsystem holding on to excessive amounts of icons. (#4899)
* Fix overlay subsystem holding on to excessive amounts of icons. (#58378)

* Fix overlay subsystem holding on to excessive amounts of icons.

The use of the icon file reference should be ok because they aren't ref counted anyways,

* Rename icon

* Makes the shit actually work

* Removes caching all together.

* fix compile errors

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fix overlay subsystem holding on to excessive amounts of icons.

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-04-14 12:48:41 +01:00
SkyratBot
1f42df4c6a [MIRROR] Allow splitting admin tabs (#4890)
* Allow splitting admin tabs

* Update statbrowser.html

* aaaa

Co-authored-by: celotajstg <81999976+celotajstg@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 18:49:19 +01:00
SkyratBot
2a26d1a54d [MIRROR] Four New Sects, small rethemes to first 3 (#4832)
* Four New Sects, small rethemes to first 3

* Update species.dm

* Update species.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 12:27:21 +01:00
SkyratBot
ef50ca23cb [MIRROR] Ports Cryopods (#4880)
* Ports Cryopods (#58025)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Kokonut <38844529+maxymax13@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Ports Cryopods

* aaaa

* Update cryopod.dm

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Kokonut <38844529+maxymax13@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 11:53:56 +01:00
SkyratBot
4c68e4fe4e [MIRROR] Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern. (#4864)
* Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern. (#58236)

About The Pull Request

ID cards when equipped will check the player's living hours if the USE_LOW_LIVING_HOUR_INTERN flag is set. If their living hours is less than the first of the following (checked in order from 1st to 3rd until a valid value is found):

    Config USE_LOW_LIVING_HOUR_INTERN_HOURS
    Config USE_EXP_RESTRICTIONS_HEADS_HOURS
    Hardcoded 15 hours

Then their ID card is tagged as Intern Assignment, unless they're a Head of Staff in which case they become an Assignment-in-Training.

PDAs, Wallets and Tablets also update any ID cards they hold, so equipping a PDA, Tablet or Wallet will also update any ID cards inside it.

This occurs automatically, even if the card does not belong to the owner. This only occurs when the user's assigned_role is a station job.

* Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-04-13 02:01:42 +01:00
SkyratBot
ee9a63178e [MIRROR] Adds a phobia of guns (#4851)
* Adds a phobia of guns (#58308)

* Adds a phobia of guns

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-12 22:09:06 +01:00
SkyratBot
835dee4581 [MIRROR] TGUI Outfit Manager and Editor (#4828)
* TGUI Outfit Manager and Editor

* Update persistence.dm

Co-authored-by: Trigg <36010999+TriggeredBoi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-11 23:12:40 +01:00
SkyratBot
187119d985 [MIRROR] Security Level subsystem (#4809)
* Security Level subsystem

* aaa

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-11 00:11:52 +01:00
Azarak
85b5cbc378 cultures and languages (#4647)
* cultures and languages

* botanist fix

* missing languages

* make sure new saves from scratch get a species set correctly

* Update preferences.dm

* Update new_player.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-10 18:30:32 +01:00
SkyratBot
bc6c285adb [MIRROR] Advanced Greyscale Sprite Generation (#4792)
* Advanced Greyscale Sprite Generation (#58112)

* Nonfunctional greyscale code

* Functional greyscale sprites via filter

Probably going to set the icon instead later

* Switches to greyscale json config

* Adds the reference layer type and converts the other canister types

* Working previews

* Adds readme

* Fixes overlays and breaking

* Removes old canister sprites

* Removes an unused var

* Fixes tgui lints

* Removes a bunch of the old canister icon states

Yeah I need to fix relabeling as well

* Removes some debug sprites

* Sorts canister type list and breaks up base shader step

* Removes an unnecessary preview hack

* Makes prototype canister greyscale

* Properly sizes the ui

* Fills in the canister map sprite

* Adds some more warnings to layers

* Makes broken overlay more prominent

* Removes a preview var that isn't needed anymore

* Cleans up client ref in Destroy

* Cleans up the tgui window a bit

* Update GreyscaleModifyMenu.tsx

* Animates the canister falling over

* Removes a commented out line that's no longer needed

Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Advanced Greyscale Sprite Generation

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-04-10 17:59:30 +01:00
Gandalf
0b957f39a9 Lobby UI overhaul (#4738)
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* aaaaa

* Update _basemap.dm

* Update new_player.dm

* Update CaveGenerator.dm

* aaaaaaaaaaaaaaaaaaaaa

* a

* aaa

* aaaa

* aaaa

* Update login.dm

* aaaaaaaaaa

* aaaaaa

* Update lobby.dm
2021-04-09 21:18:40 +01:00
Funce
e5e448ab62 Ambition logging (#4765)
* Sets up ambition logging baseline framework

* That's one line, how did I write it

* Have to rewrite all the logs!

* I don't know what I'm doing anymore

* I think this is the last thing

* Log ambition is now added to config

* Ambition flag now correctly checks for the ambition flag

* Okay /here/ we go

* No more lowercase ckeys in admin chat

* Admin actions are now logged too
2021-04-09 16:01:00 +01:00
Useroth
4e3ec3bf86 Update ticker.dm (#4764) 2021-04-09 02:22:49 +02:00
Useroth
06983aedb7 opsie wopsie (#4763)
* Update skryat_config_entries.dm

* Update ticker.dm
2021-04-09 02:20:01 +02:00
Funce
cd8c6fa413 Make some configs for the gamer alert ping (#4760)
* Make some configs for the gamer alert ping

* Add to config lets go

* Update ticker.dm

* Update ticker.dm

* Update skryat_config_entries.dm

* Update skyrat_config.txt

* Update skryat_config_entries.dm

* Update ticker.dm

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-04-09 01:06:06 +02:00
SkyratBot
a2eaebb7a7 [MIRROR] Reduces the amount of unsorted chat messages (#4742)
* Reduces the amount of unsorted chat messages (#58192)

* Reduces the amount of unsorted chat messages

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
2021-04-08 14:17:11 +01:00
Gandalf
4b917b713f Rockplanet LZ-669 [READY] (#4534)
* aaaaaaaaaa

* aqaa

* aaaaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaaaaaaaaaaaa

* aaaaaa

* Update rockplanet.dmm

* aaaaaaaaaaaa

* Update rockplanet.dm

* Update rockplanet.dm
2021-04-06 19:25:09 +01:00
SkyratBot
b261424aaa [MIRROR] Fixes a minor oversight with eigenstasium (#4587)
* Fixes a minor oversight with eigenstasium (#58069)

* Fixes a minor oversight with eigenstasium

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-04-02 01:35:55 +01:00
Cheshify
3bfb26f12a [SEMI MODULAR] Discord Link Updates (Config) (TM this) (#4507)
* Unga Dunga Config Changes :)

* More Config Stuff
2021-04-01 17:34:59 +01:00
Gandalf
d14f4ea7c9 Revert "Revert "[MIRROR] Layer overhaul (#4503)" (#4509)" (#4536)
This reverts commit b27ede689e.
2021-03-31 02:08:56 +01:00
Useroth
b27ede689e Revert "[MIRROR] Layer overhaul (#4503)" (#4509)
This reverts commit 8ac892d340.
2021-03-30 23:45:08 +01:00
SkyratBot
1fbe38a51a [MIRROR] [Ready] Fermichem part 2.3 Adds a new reagent: Eigenstasium (#4445)
* [Ready] Fermichem part 2.3 Adds a new reagent: Eigenstasium

* Update quirks.dm

* Update closets.dm

* aaaaaaa

* Update lizardpeople.dm

* Update mothmen.dm

* Update species.dm

* Update species.dm

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-30 10:12:19 +02:00
Useroth
faf4762e63 [Mostly non-modular] Stuff to accomodate multiple servers talking to the same database, including local/global bans. (#4032)
* Better accomodation of multiple servers using the same database.

* updated the PR number in readme.md

* Updated the database_changelog description.

* Oopsie.

* Cosmetic touch and sql query fixes.

* Opsie wopsie

* Oopsie x2

* Fugg
2021-03-30 07:50:29 +02:00
SkyratBot
8ac892d340 [MIRROR] Layer overhaul (#4503)
* Layer overhaul (#57915)

## About The Pull Request
Changes up some layer and plane defines for no particular reason lol

## Why It's Good For The Game
Planes actually override layers, and layers control ordering within planes. A lot of the usage of plane and layer was wholly unnecessary. This refactor helps future maintainability while also being needed staging for _future features._

* Layer overhaul

* aaaaaaaaa

a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-29 16:36:36 +01:00
SkyratBot
17e74d67d1 [MIRROR] Remove SS_NO_TICK_CHECK (#4483)
* Remove SS_NO_TICK_CHECK (#57800)

## About The Pull Request
This is a whopper, will need @ MrStonedOne to review.
In theory this flag shouldn't be needed and my own testing didn't find any issues, but I'd feel better with a lengthy test merge.

## Why It's Good For The Game
Might make nightshift subsystem lag less, MC loop has less stuff to check.

* Remove SS_NO_TICK_CHECK

Co-authored-by: spookydonut <github@spooksoftware.com>
2021-03-28 17:25:24 +01:00
SkyratBot
49836e4fac [MIRROR] Adds explorer drones / adventures. (#4424)
* Adds explorer drones / adventures.

* Update persistence.dm

* Update asset_list_items.dm

* MAP RESET

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-26 15:49:44 +00:00
SkyratBot
3295778768 [MIRROR] Additional CTF maps (#4400)
* Additional CTF maps

* Update radio.dm

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-26 15:33:14 +00:00
SkyratBot
a3f6a41ee9 [MIRROR] Ref Tracking: Revengance (#4413)
* Ref Tracking: Revengance (#57728)

* Ref Tracking: Revengance

Fixes reference tracking ignoring self references due to a poorly thought out tick checking system.
Fixes reference tracking ignoring the contents of assoc lists
Makes the reference tracking printouts actually describe what list the ref is in, rather then just saying "list"

Adds REFERENCE_TRACKING_DEBUG, a define which toggles tracking info for the ref tracking procs, which allows for
oversight on how the proc is working

Allows for direct calls of qdel_and_find_ref_if_fail(), makes it use ref rather then REF(), fixing it breaking
for mobs. (Ditto for the qdel hint which does the same thing)

Moves REAGENTS_TESTING out of the reftracking define block
Makes unit tests define REFERENCE_TRACKING, REFERENCE_TRACKING_DEBUG, and FIND_REF_NO_CHECK_TICK

Adds a unit test that sanity checks the reference finder proc

* Ref Tracking: Revengance

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-03-26 10:30:59 +00:00
Gandalf
e1456b0cf6 Massive announcer/BSA overhaul (#4254)
* oh yeehaw

* Update default_announcer.dm

* a

* Update sound.dm

* Delete poweroff.ogg

* pref+newshit!

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* a

* Update set_security_level.dm

* a

* a

* a

* Update default_announcer.dm

* a

* a

* Update priority_announce.dm

* a

* Update priority_announce.dm

* ERT NOW HAS AN ALERT OPTION

* more changes to sounds! ALERTS

* Update set_security_level.dm

* THSI IS THE WAYSDFSASA

* you think you've seen shitcode? just you wait cowboy.

* a

* Update set_security_level.dm

* Update default_announcer.dm

* Update set_security_level.dm

* Update set_security_level.dm

* Update gravitygenerator.dm

* BSA AND FIXES!

* a

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* aaaaaaaaaaaaaa

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* a

* autodocker

* Update modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-23 00:16:26 +00:00
SkyratBot
1f1aff1685 [MIRROR] Ports TGUI Vote Panel (#4308)
* Ports TGUI Vote Panel

* a

* Update vote.dm

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-22 00:01:23 +00:00
SkyratBot
5764f24f98 [MIRROR] Departmental officers are now put together, rather than separate, if possible (#4285)
* Departmental officers are now put together, rather than separate, if possible (#57685)

Security officers will now be paired up together in the same department, across departments. This means that, instead of 4 officers being split across 4 departments, there'll now be 2 groups of 2.

Late-join officers will be put into any department with only 1 officer. If none exist, the least populous department will be chosen, with their preference having priority.

Updates the maps to have more spawns for departmental officers. Delta previously had none, and now has some. Fixed a bug where MetaStation's security departmental officer was a supply one instead.

Removes the "random" departmental preference. All security officers are now given a department. The "none" preference still exists, but just to show that you don't care which department you're put into.

Updates the config to comment out SEC_START_BRIG. This is what the configuration was already on live servers.

This is something that should likely be test merged, but it mucks with savefiles. Luckily, the only damage it does is changing random departments to none, so if a TM is reverted, only that will have to be changed.

* Departmental officers are now put together, rather than separate, if possible

* Update preferences.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-03-21 23:12:41 +00:00
SkyratBot
26f1f39c17 [MIRROR] Makes cargo canister listings get automatically generated at runtime (#4295)
* Makes cargo canister listings get automatically generated at runtime

* Update canister.dm

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-21 14:58:03 +00:00
SkyratBot
5fad2f6404 [MIRROR] Prevent possible augury hard deletes (#4294)
* Prevent augur deletes (#57853)

* Prevent possible augury hard deletes

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-03-21 14:49:54 +00:00
SkyratBot
9ffdf58259 [MIRROR] Some explosions code cleanup (#4276)
* Some explosions code cleanup (#57493)

Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf

* Some explosions code cleanup

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-21 01:03:36 +00:00
Gandalf
aa1059119e CME tweaks and fire occurrence reduction (#4249)
* a

* a

* Update cme.dm
2021-03-20 01:17:44 +00:00
SkyratBot
cbc41f5d13 [MIRROR] Fixes bug with atoms (including new players!!!!) not spawned from the holodeck being deleted by it if they happened to be initialized at the same time (#4260)
* Fixes bug with atoms (including new players!!!!) not spawned from the holodeck being deleted by it if they happened to be initialized at the same time (#57510)

About The Pull Request

Fixes #57446
yeah not my best moment, holodeck currently sets SSatoms to add every call to InitAtom() to a list and then give it back to the holodeck console (it actually goes through map_template/holodeck to do it but whatever). However it turns out atom/New() calls InitAtom too, so if an atom is created while SSatoms is still creating the list to give to the holodeck then that atom is added to the list regardless of whether or not its actually from the holodeck template.

Now theres an extra argument to InitAtom that tells it whether its spawned directly from a map template (ie, its part of the input list of uninitialized atoms that InitializeAtoms was given) or otherwise the output list that the holodeck uses is populated by calling GetAllContents on all atom/movables spawned directly from the template.

also renamed some vars in initTemplateBounds because it was hard to reason what it was doing and made it use as anything

also note that loading a map template with returns_created_atoms = TRUE will no longer track atoms that arent in the map file but are spawned directly onto a turf, currently nothing does this with the holodeck (which is the only map template that has this feature)

by the way this bug is my fault
Why It's Good For The Game

incredibly incredibly unlucky new players dont deserve to be deleted just because they didnt spawn in the holodeck
Changelog

🆑
fix: the holodeck is no longer so powerful that it can destroy anything and everything that dares to start existing while it's busy loading programs
/🆑

* Fixes bug with atoms (including new players!!!!) not spawned from the holodeck being deleted by it if they happened to be initialized at the same time

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-03-20 00:09:51 +00:00
Gandalf
951425133e Player panel improvements [be antag & character name] (#4222)
* a

* a

* a

* Update preferences.dm

* Update statpanel.dm

* Update new_player.dm

* Update new_player.dm

* modular statpanel

* a

* Update statpanel.dm
2021-03-18 20:19:29 +00:00
SkyratBot
7abc7c5480 [MIRROR] Remove no tick check flag from SSshuttle (#4227)
* Remove no tick check flag from SSshuttle (#57605)

* Remove no tick check flag from SSshuttle

Co-authored-by: spookydonut <github@spooksoftware.com>
2021-03-18 12:30:33 +00:00
SkyratBot
c2d6dd7d75 [MIRROR] Fixes a ton of harddels (#4215)
* Fixes a ton of harddels (#57736)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* Fixes a ton of harddels

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2021-03-17 20:42:47 +00:00
SkyratBot
84f6558402 [MIRROR] Tramstation: choo choo MORE MAP COMIN' THROUH (#4083)
* Tramstation: choo choo MORE MAP COMIN' THROUH

* Tramstation: Skyrat Edition (#4104)

* Decals Fixed

* Modularity? Whatever

* Fuck me if I need to make a second PR for this

* Blueshield + Cryo + Ian Fursuit

* Automatic changelog generation for PR #4104 [ci skip]

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Cheshify <73589390+Cheshify@users.noreply.github.com>
2021-03-12 23:19:38 +00:00
SkyratBot
da9f453f6b [MIRROR] SecHUD icon generation fixes and code improvement. (#4067)
* SecHUD icon generation fixes and code improvement. (#57570)

* SecHUD icon generation fixes and code improvement.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-11 13:40:20 +01:00