Commit Graph

2942 Commits

Author SHA1 Message Date
SkyratBot
f8042b6306 [MIRROR] Adds Neon Carpet (#6302)
* Adds Neon Carpet (#59140)

Adds a couple varieties of neon carpet.
Makes decals care about their plane in addition to their layer.

* 0

* A

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-15 18:12:49 +01:00
SkyratBot
00519c0c1a [MIRROR] Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good! (#6286)
* Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good!

* Mirror!

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-14 18:43:14 +12:00
SkyratBot
6f3b151bb8 [MIRROR] Fixes a bunch of harddels that are sourced from player action (#6252)
* Fixes a bunch of harddels that are sourced from player action

* Mirror!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-11 03:13:33 +01:00
SkyratBot
cd7e358f52 Deep sendmaps profiling (#6237)
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-11 00:02:39 +01:00
SkyratBot
0fa2b48b59 [MIRROR] 2FA for Admins (#6221)
* 2FA for Admins

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-10 23:59:30 +01:00
SkyratBot
2d04f758b2 [MIRROR] [READY] Lighting list cleanup. (#6238)
* [READY] Lighting list cleanup. (#59002)

Removed a bunch of back reference lists that were either entirely unused, or contained references that could be found within the datums contained in other lists.

lighting corner datums now get deleted with unused.

light sources no longer track lighting corners where the appiled light rounds to 0.

Fix lighting on turfs that gained dynamic lighting mid round. lazy init corner datums.

these two are related. by decoupling corner datums from the turfs dynamic lighting state, we can use them to know what level of light a non-dynamic light turf should have once it gains dynamic light.

Also should free up some memory not storing these datums in maint. Corner datums only exist on a turf that has light cast upon it by the dynamic lighting system.

Lighting corners are now lazy inited and deleted. they should always (and only exist) if there is a light source shining on it within range (even if the turf has no dynamic lighting). This is needed to support turfs that become lighting enabled mid round. On the plus side, they will no longer be generated on full dark turfs.

* [READY] Lighting list cleanup.

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2021-06-10 23:47:04 +01:00
SkyratBot
cd94063668 Fix race condition in SSmapping z-level creation (#59560) (#6207)
As described in issue #56733, there is a possibility of a race condition in SSmapping.add_new_zlevel - either during Z level incrementing, or the proc itself, as it only expands the amount of registered z-levels after being finished.

While the first hopefully shouldn't happen, it can still manifest because of the CHECK_TICK within. A practical result is that two concurrent calls to this proc will both create a new Z-level, but actually report having made the same first one.

This is problematic for map_templates that will then load blindly to the reported Z-level when using load_new_z, overwriting each other. We sometimes encounter that end result on CM13 codebase because of a map load that can be triggered by an user topic - if two people click at the same time, it's not unlikely for the first call to sleep in CHECK_TICK and let the second run, causing double-loading.

Co-authored-by: fira <loyauflorian@gmail.com>
2021-06-10 08:55:34 +12:00
SkyratBot
79fee4cca8 Stops the drive-by landing from sending some players to space (#59546) (#6196)
Adds a safety check to DropLandAtRandomHallwayPoint() to send mobs to the arrivals shuttle if get_safe_random_station_turf() returns null. This prevents people from being dumped in the supply pod shipping lane.

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-06-09 10:43:31 +12:00
SkyratBot
47179b4211 [MIRROR] Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content) (#6153)
* Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content) (#59373)

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

* Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content)

* Mirror!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 11:47:38 +12:00
Funce
fc80859839 Bedroom Crew~ (#6117)
* Bedroom Crew <3

* Part 2! <3
2021-06-05 17:38:57 +12:00
SkyratBot
e27ce8d4fd [MIRROR] More GAGS debug and color select improvement (#6144)
* Improved GAGS debug (#59392)

* More GAGS debug and color select improvement

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-06-05 17:12:11 +12:00
SkyratBot
3103eee3d1 [MIRROR] Deletes code that has a comment stating that it should be deleted after an issue that is now closed is resolved. (#6130)
* Removes SSmapping delayed config loading. (#59328)

Does it in /New instead

* Deletes code that has a comment stating that it should be deleted after an issue that is now closed is resolved.

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
2021-06-05 16:37:36 +12:00
SkyratBot
4914ae5ae1 [MIRROR] Datum mat GAGS support and mace migration (#6059)
* Datum mat GAGS support and mace migration

* Mirror!

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 15:49:32 +12:00
SkyratBot
d3a2f60d78 [MIRROR] GAGS Lizard Plushes (#6007)
* GAGS Lizard Plushes  (#59323)

* greyscale lizards

* repathing

* uses set greyscale

* mapped sprite

* GAGS Lizard Plushes

* Goodbye lizzers

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 14:40:42 +12:00
SkyratBot
04abb98894 [MIRROR] Remove a bunch of old gamemode code (#6025)
* Remove a bunch of old gamemode code

* Mirror!

* Woopsie, modular game modes!

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 12:36:59 +12:00
BluBerry016
9e0647852b [FUCK] Fixes Random Mining (#5974)
* Update mapping.dm

* Update mapping.dm

* Update mapping.dm

* Update mapping.dm

* Update mapping.dm

* Update mapping.dm

* Update mapping.dm
2021-05-30 22:52:19 +01:00
SkyratBot
c0830c5fcd [MIRROR] Removed proc overhead from the Input subsystem (#6010)
* Removed proc overhead from the Input subsystem (#59339)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Removed proc overhead from the Input subsystem

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2021-05-28 16:41:19 +01:00
SkyratBot
5cdc6a6bc9 [MIRROR] Moves explorer adventures to the database. (#5923)
* Moves explorer adventures to the database.

* Cleans up Merge Conflict. Increments DB Version (#5979)

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

* Update tgstation_schema.sql

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: ORCACommander <ORCACommander@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-05-27 21:59:34 +02:00
BluBerry016
a5a6bc1e8d [Non-Modular] Implement sanity check so random mining doesn't load on icebox (#5924)
* Automatic changelog compile [ci skip]

* Implement sanity check so random mining doesn't load on icebox

* AAAAAAA

* Update mapping.dm

* Revert "Update mapping.dm"

This reverts commit 7f21ab22f786a32d3720dff7574fedc4111f1476.

* Revert "AAAAAAA"

This reverts commit bbf839213d6d3a491017c8cd0fa9587d56841720.

* Revert "oke"

This reverts commit b974de84b836034d3d0cc565f44a9ed417f66f6d, reversing
changes made to a35307c16b1f4757a08f95d883c971e340a8ac31.

* Update mapping.dm

* Update 2021-05.yml

Co-authored-by: Changelogs <action@github.com>
2021-05-26 16:35:51 +01:00
SkyratBot
0a0835b833 [MIRROR] Integrated Circuits (Wiremod) (#5949)
* Integrated Circuits (Wiremod)

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-25 19:57:29 +01:00
SkyratBot
456f347dfa [MIRROR] USE SIGNAL_HANDLER REEEEEE (#5921)
* use SIGNAL_HANDLER REEEEEE (#59242)

makes as many procs as i can find use the SIGNAL_HANDLER define which i assumed they all already did

* USE SIGNAL_HANDLER REEEEEE

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-05-25 03:42:11 +01:00
Gandalf
56a7766d1b Revert "Fixes master 514 (#5927)" (#5929)
This reverts commit aab764575a.
2021-05-25 03:24:45 +01:00
Gandalf
aab764575a Fixes master 514 (#5927)
* a

* l

* Update sheet_types.dm
2021-05-25 03:06:58 +01:00
SkyratBot
49299139cf [MIRROR] Re-add the debug controller verb (#5892)
* Re-add the debug controller verb (#59027)

* Re-add the debug controller verb

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2021-05-24 03:25:43 +01:00
Azarak
20db06c6d0 Liquids system (#4584)
* a

* a

* uncommentize

* aa

* Cache stuff

* Attrition

* blcok heights

* Abstractify reagents

* Lots of stuff

* stuff

* stuffs n drains

* Update drains.dm

* pumps and drains

* Update liquids.dm

* Ethanol burns, but only sometimes..

* color debug and big fuel tank boom fix

* watermeta

* Atmos moment

* Update living.dm

* burn

* anti-aliased icons, drain fix, liquids not on space

* Thermal energy + magboots fix

* Update liquids.dm

* Plumbing devices for liquids & engineering plumbing rcd

* From the creators of watermeta: WaterKilo

* Update WaterKiloStation.dmm

* Update WaterKiloStation.dmm

* Update _basemap.dm

* ocean biome generator

* Convert immutables when constructed over

* Forgot water pumps for station

* Update liquids.dm

* Ocean ruins

* cool looking blue ocean

* a

* a

* a

* weh

* a

* aa

* Merge pull request #1 from Azarak/errrrrror

Updates

* finishing touches

* aaa

* aaaa

* aaaa

* patch

* map fixes

* not so high pressurized now

* squeezing into bucket now removes 75% reagents, buckets get 100 volume

* empty ocean maps not used anymore

* reforged

* Update WaterKiloStation.dmm

* Update ocean_listening_outpost.dmm

* Update WaterKiloStation.dmm

* a

* ol

* 0

* Update liquids.dm

* Update _open.dm

* 0

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-24 02:43:57 +01:00
Gandalf
5f10f39257 Expeditionary corps + Black Mesa + Trusted Player System (#5418)
* OH YEAH BOIS BRING THE SALT

* AAAAAA

* AAAAAAAA

* Update tgstation.dme

* AAA

* Update uniform_digi.dmi

* AAAAA

* Update trusted_players.txt

* \ADSA

* AAA

* Update expeditionary_corps.dm

* AAAA

* Update expeditionary_corps.dm

* Update jobmanagement.dm

* Update expeditionary_corps.dm

* AAA

* AA

* Update wildwest.dmm

* AAAAAAAAA

* Update wildwest.dmm

* AAAAAA

* Update clothing.dm

* AAAA

* AAA

* AA

* AA

* AAA

* Merge branch 'master' into exp-corps

* Update _basemap.dm

* Update map_template.dm

* AAAAAAAA

* AAAAAAAA

* fc

* AAA

* Update faithless.dm

* Update faithless.dm

* Update wildwest_skyrat.dmm

* CHANGES EXP TROOPER TO SCIENCE

* OH YEAH

* AAA

* AAA

* Update jobs.dm

* AAA

* AAAAAAAAAAAAAAAAAA

* Update modular_skyrat/modules/exp_corps/code/clothing.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* stupid action button

* aaa

* Merge branch 'exp-corps' of https://github.com/Skyrat-SS13/Skyrat-tg into exp-corps

* Merge branch 'master' into exp-corps

* a

* AAAAAAAAA

* Update sector_c.dm

* WOAH THATS A LOT OF FILES

* AAAAAAAA

* Update black_mesa.dm

* Update black_mesa.dm

* AAAA

* aaaaaa

* Update black_mesa.dm

* a

* 00

* a

* Update black_mesa.dm

* HEDCRABS

* fffff

* aaa

* 000

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* F

* aaa

* NO MORE GOD OPS!

* Update blackmesa.dmm

* 0

* AAAAA

* Update black_mesa.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update expeditionary_trooper.dm

* Update black_mesa.dm

* Update black_mesa.dm

* a

* a

* a

* a

* Update uniform_digi.dmi

* no raping ears

* Update uniform.dmi

* Update hev_suit.dm

* Update black_mesa.dm

* a

* a

* a

* Update blackmesa.dmm

* Update blackmesa.dmm

* AAA

* Update black_mesa.dm

* Update blackmesa.dmm

* A

* a

* Update job.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update biohazard_blob_mobs.dm

* a

* Update mold_event.dm

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: Tom <tomforde4@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-05-23 17:00:39 +02:00
BluBerry016
fabd25cd19 w-weh? (#5879) 2021-05-23 15:05:56 +01:00
SkyratBot
4acf0f5dd8 [MIRROR] Fixes bombproof containers not protecting their content in some cases (#5844)
* added get content recursive flag check (#59191)

* Fixes bombproof containers not protecting their content in some cases

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2021-05-21 14:24:33 +01:00
SkyratBot
ea9aed5554 [MIRROR] Replace alert usage with tgui_alert (#5815)
* Replace alert usage with tgui_alert

* a

* Update observer.dm

Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-21 00:06:09 +01:00
SkyratBot
ffe1b2b1d7 [MIRROR] Fix unintended case allowing multiple AI spawns shiftstart (#5808)
* Fix unintended case allowing multiple AI spawns shiftstart (#59160)

* Fix unintended case allowing multiple AI spawns shiftstart

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-05-20 22:32:32 +01:00
SkyratBot
6c54894872 [MIRROR] Makes timer subsystems available as a new subsystem type (#5719)
* Makes timer subsystems available as a new subsystem type (#59073)

* Makes timer subsystems available as a new subsystem type

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-15 19:52:50 +01:00
SkyratBot
3411052970 [MIRROR] ambience subsystem no longer plays to people in lobby (#5689)
* ambience subsystem no longer plays to people in lobby (#59071)

* ambience subsystem no longer plays to people in lobby

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-05-14 22:13:38 +01:00
FlamingLily
654aad337f Update job.dm (#5682) 2021-05-14 15:37:53 +01:00
SkyratBot
9096f96997 [MIRROR] Split malf AI antag datum away from traitor, enable malf AI roundstart ruleset. (#5635)
* Split malf AI antag datum away from traitor, enable malf AI roundstart ruleset.

* AAAAA

* AAAAA

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-13 15:13:09 +01:00
BluBerry016
952210e364 [Semi-Modular] *Inflates your rockplanet making it full of content and fun* (#5587)
* DEFINE NEW RUINS TYPE BABY

* Update Rockplanet.dmm

* Update Rockplanet.dmm

* Example ruin

* Update maps.dm

* Update rockplanet.dm
2021-05-13 14:49:16 +01:00
SkyratBot
341ca10760 [MIRROR] Reduce default Maint. Drone playtime requirement (#5595)
* Reduce default Maint. Drone playtime requirement (#59011)

* Reduce default Maint. Drone playtime requirement

Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>
2021-05-10 22:46:46 +01:00
SkyratBot
01a2d62e9e [MIRROR] Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more) (#5586)
* Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more) (#58882)

* Kills BOTH /poison paths by turning poisonous into an element. (+fantasty prefix, sanity on attackingtarget signal, and more)

* AAAAAAAA

* Update spellbook.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-10 15:12:34 +01:00
SkyratBot
5e289dad34 [MIRROR] Refactors playtime tracking code. (#5546)
* Refactors playtime tracking code.

* Update robot.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-10 14:54:05 +01:00
SkyratBot
fcb1301f64 [MIRROR] SStramprocess only fires on maps with trams actually present on the map (#5565)
* tramprocess only fires on maps with trams (#58940)

* SStramprocess only fires on maps with trams actually present on the map

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-05-09 00:24:28 +01:00
SkyratBot
0d47e63221 [MIRROR] Mail holidays. (#5554)
* Mail holidays. (#58728)

* Mail holidays.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2021-05-08 13:44:11 +01:00
FlamingLily
e9fd6cb13e [FIXED] [MOSTLY MODULAR] Alt titles (#5150)
* it is coming

* fuckin' spelling

* more :)

* saaave meeeee

* id/pda work

except roundstart 😠

* kindaworks ehhh

* special request :)

* manifest me baby

* I am a coder with high standards

i can make spaghetti

oh no you're meeting all my standards

* hos is the department dead

* modularisation begin

* /

* manifest sorting

and by that I mean oh god the lists

* manifests, but modular

* plug n play

* module complete

* blueshield ipcs have monitors for heads :)

* fuck

* Update _job.dm

* Update jobs.dm

* more titles

* even MORE

* i forgot the document

* Update jobs.dm

* counsellor and code cleanup

* Liberty. Reason. Justice. Civility. Edification. Perfection.

* MAIL.

* Update jobs.dm

* Update _job.dm

* couple title changes

no bug fix yet gimme time

* i

* CRITICAL FIX

and some modularisation

* Off-duty

* brigoff, and some cleanup

* everybody loves a clown

so why don't you?

* Update job.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-07 03:14:49 +01:00
Gandalf
e0babbca6d Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg 2021-05-07 02:40:44 +01:00
Funce
680a6d1213 INFINITUM LOOPIES (#5512) 2021-05-07 00:58:04 +01:00
Gandalf
3880a61fa2 Update ticker.dm 2021-05-07 00:30:09 +01:00
SkyratBot
c84d208fa6 [MIRROR] Sorts the majority of the rest of the unsorted chat (#5459)
* Sorts the majority of the rest of the unsorted chat

* 0.

* Update database_changelog.txt

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-06 23:48:08 +01:00
SkyratBot
b5dc716b24 Greyscale sombrero and shamebrero (#5496)
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-06 15:08:09 +01:00
SkyratBot
42bd885efd [MIRROR] Fixes a fuck ton more harddels (#5476)
* Fixes a fuck ton more harddels (#58779)

Redoes how geese handle eating shit, it was fucking stupid and caused harddels, and while this method is technically slower in the best case, it's a fucking goose
Fixes action related harddels, I hate how they work but at least this way they won't hold refs.
Fixes the hierophont causing its beacon to harddel
Removes the M variable from megafauna actions, it was used like a typed owner and caused harddels, so I burned it
Fixes target and targets_from harddels, replaces all setters of target with LoseTarget and GiveTarget, which should help maintain behavior. I'm not sure if this breaks anything, but if it does we should fix the assumptions that code makes instead of reverting this change
Fixes more area_senstive_contents related harddels, we need to allow the mob to move before clearing out its list.
Fixes marked object harddels (I'm coming for you admin team)
Fixes a language based human harddel
Fixes managed overlay related harddels (This was just emissive blockers, but I think this is a good safety net to have. If we clear the overlay list we should clear this one as well)
Fixes bot core harddels, I hate the fact that this exists but it has no reason to know who its owner is
Adds a walk(src, 0) to simple_animal destroy, it's the best bang for the buck in terms of stopping spurious harddels. Walk related harddels aren't that expensive in the first place, since byond does the same thing I'm doing here, but this makes finding mob harddels easier, so let's go with it
I fixed another source of part harddels, I hate fullupgrade so much
Fixes all the sound loop harddels

* Fixes a fuck ton more harddels

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-05-05 17:46:22 +01:00
death and coding
2ae15d08d3 mostly [modular] renames brig off to correction officer, on request of gandalf (#5453)
* [semi-modular] Renames Brig Officer to Correction Officer on request of Gandalf

* Update jobs.dm

* my name i

* s Patrick, I'm 31, and I'm not here to cause harm. Please do not contact the police , please don't alert the authorities, please don't freak out. I'm not going to kill myself or hurt anyone or anything like that, but please don't freak out. My name is Patr

* go on

* ???

* Update security.dm

* more, more

* Dear top I'm writing you this tomato I'm writing this email to make sure you know that I tried to make a fund video unfortunately, unfortunately that didn't turn out so well my hypothesis in my experience Haitians were not happening as well as I plant and I'm really sorry you'll never happen again, please don't fire me I hope we can still be best friends your if if fewer from your best friend sure not now if if if if if,  Thank you again,.  Sharma 908 auburn 500 Joe favor employee

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-05-05 00:34:40 +01:00
death and coding
a0a18940d3 [Ready][kinda][Semi-Modular] Brig Officers, Prison guards that have one job, guard the prison (#5386)
* yarr

* Update modular_skyrat/modules/customization/modules/clothing/glasses/_glasses.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/_glasses.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/_glasses.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/_glasses.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* Update modular_skyrat/modules/customization/modules/clothing/glasses/_glasses.dm

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>

* oh yeah fuck it thrown in the REAL black boots

* there, black boots properly

* plans for later

* Automatic changelog compile [ci skip]

* Update suit.dmi

* Update eyes.dmi

* merge upstream/master into eyebaybay

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* [WIP] Brig Officers, Prison guards that have one job, guard the prison

* I ACTUALLY CALLED IT BLUESHIELD

* Delete readme.md

* Delete security.dm

* idtrim i think

* no tator

* Create closet.dmi

* Create security.dm

* I FORGOT THE DME

* Update breath.dm

* Merge remote-tracking branch 'origin/master'

* Update tgstation.dme

* NO WARDEN SHIT FOR YOU

* hoho

* hope this works

* togglefix

* Update uniform_digi.dmi

* how come you get TWO digis

* F8IXI96YRTRTTRFGDHFFHGFHGFG

* better mask

* one

* icon stuff for a re...thungy

* no needed

* Update security.dm

* Update security.dm

* fixed an error with an old uni i added aaaaaaa

* Update job.dm

* Update job.dm

* aaaaaaaaaaaand maps are done, thanks to cera

* better outfit

* Update uniform.dmi

* I FORGOT LANDMARKS

* Update KiloStation_skyrat.dmm

* Delete _glasses.dm

not needed

* ditto

* aaa

* wa

* save a headacke

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Tom <tomforde4@gmail.com>
Co-authored-by: louiseedwardstuart <bonniefluff>
Co-authored-by: louiseedwardstuart <bonniefluff@protomail.com>
2021-05-03 22:31:34 +01:00
SkyratBot
336d99adcd Security citations are now logged to the DB (#5422)
Co-authored-by: Nick <nick@nfreader.net>
2021-05-03 15:12:59 +01:00