Commit Graph

9667 Commits

Author SHA1 Message Date
SkyratBot
ad35f582a9 i have moved some bible exorcism functionality to a signal on soulstones (#60768) (#7622)
moves functionality of exorcising soulstones to soulstones themselves

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-08-19 14:27:31 -04:00
SkyratBot
40c5a53613 puts chem mass spectrometer inline with other machines (#60896) (#7634)
Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-08-19 11:44:53 -04:00
SkyratBot
169c42a262 [MIRROR] Refactors connect_loc_behalf into a component (#7613)
* Refactors connect_loc_behalf into a component (#60678)

See title. Also refactors caltrops into a component because they use connect_loc_behalf which requires them to hold the state.

This also fixes COMPONENT_DUPE_SELECTIVE from just outright not working.

connect_loc_behalf doesn't make sense as an element because it tries to hold states. There is also no way to maintain current behaviour and not have the states that it needs.
Due to the fact that it tries to hold states, it means the code itself is a lot more buggy because it's a lot harder to successfully manage these states without runtimes or bugs. 

On metastation, there is only 2519 connect_loc_behalf components at roundstart. MrStonedOne has told me that datums take up this much space:
image

If we do the (oversimplified) math, there are only ever 5 variables that'll likely be changed on most connect_loc_behalf components at runtime:
connections,
tracked,
signal_atom,
parent,
signal_procs

This means that on metastation at roundstart, we take up this amount: (24 + 16 * 5) * 2519 = 261.97600 kilobytes
This is not really significant and the benefits of moving this to a component greatly outweighs the memory cost.

(Basically the memory cost is outweighed by the maint cost of tracking down issues with the thing. It's too buggy to be viable longterm basically)

* Update glass.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-17 20:29:11 +01:00
SkyratBot
b0c01e40af [MIRROR] Del The World: Unit testing for hard deletes (#7589)
* Del The World: Unit testing for hard deletes (#59612)

Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>

* Del The World: Unit testing for hard deletes

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@ users.noreply.github.com>
2021-08-17 18:58:57 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
SkyratBot
a7ab3e3183 [MIRROR] Fixes the pitchfok nullrod inhands not appearing (#7593)
* Fixed the literal one word typo breaking in-hands (#60864)

* Fixes the pitchfok nullrod inhands not appearing

Co-authored-by: GreatKingWombat <79433629+GreatKingWombat@users.noreply.github.com>
2021-08-17 13:33:00 -04:00
SkyratBot
7a1d3700bb [MIRROR] Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more! (#7481)
* Drugs of the 26th century. Three new hella rad drugs, one less lame drug and more!

* Update traits.dm

* Update maint_loot_trash.dm

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:52:58 +01:00
SkyratBot
40cb513cfd [MIRROR] Mindshielding now sends a signal, and is dealt by the antagonist (#7573)
* Mindshielding now sends a signal, and is dealt by the antagonist (#60850)

Mindshielding people isn't hardcoded to the mindshield's implanting anymore, instead sending a signal, which I find better in the long run (especially for downstreams).

* Mindshielding now sends a signal, and is dealt by the antagonist

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-08-15 23:44:03 +01:00
Gandalf
c46a2a7ac9 Ports pollution from Horizon - Original PR: https://github.com/hrzntal/horizon/pull/468 (Made by Azarak) (#7453)
* AAAAAAAAAAA

* pollution scrubbbies

* fires cause smoke, right? Also NSS journey has scrubbies

* washing things removes the smell!

* what the fuck were you doing last night

* Update temporary_pollution_emission_component.dm

* space turfs shouldn't have pollution

* Fix air now fixes smoke

* Update pollution.dm

* Update pollution.dm

* Update bonfire.dm
2021-08-15 23:41:20 +01:00
linnpap
527924a756 [NON-MODULAR] Feline Trait (#7523)
* nya

* 1984

* span notice shit

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-08-15 22:53:33 +01:00
SkyratBot
61fb3aaf29 [MIRROR] Cyborg emergency reboot module now is no longer dropped if revive is succesful (#7570)
* Cyborg emergency reboot module now is no longer dropped if revive is succesful (#60848)

Co-authored-by: Colovorat <lolqwert569@ gmail.com>

* Cyborg emergency reboot module now is no longer dropped if revive is succesful

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: Colovorat <lolqwert569@ gmail.com>
2021-08-15 22:50:31 +01:00
SkyratBot
6d9b030c05 [MIRROR] Healium crystal changes (#7566)
* Healium crystal changes (#60477)

Healium crystals now straight up fix the air in a room instead of giving an undetermined amount of gas
Area fixed is now a 7x7
Changed the recipe to no longer require freon but O2 instead

* Healium crystal changes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:51:47 -04:00
SkyratBot
cea4eaa222 [MIRROR] Crystal foam - crystallizer new recipe (#7564)
* Crystal foam - crystallizer new recipe (#60535)

Adds crystal foam, a crystal grenade made in the crystallizer from CO2, N2O and H2O. When used it will release a big foamed area that will close any breaches, similar to the smart foam grenade.

* Crystal foam - crystallizer new recipe

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-08-14 22:50:49 -04:00
SkyratBot
9c06c217f9 [MIRROR] Fixes 2 DNA activator descriptions (#7551)
* Fixes 2 DNA activator descriptions (#60553)

There was an empty space between name and suffix when there wasn't one, and expended DNA activators wouldnt get the name 'expended' if it didn't work, despite being so.

* Fixes 2 DNA activator descriptions

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-08-14 22:48:06 -04:00
SkyratBot
b0d64bd0f5 [MIRROR] Ethereal food buffs. (#7544)
* Ethereal food buffs. (#60298)

* charge buffs

* Removes REM

* Ethereal food buffs.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-08-14 22:40:23 -04:00
Lamella-0587
a702f9bd9f organic interface update (#6740)
* initial

* whoops

* more fixes

* forgot

* frick

* oop

* minor visual fixes

* cleared out-of-date stuff that was asimilated by erp update. ye, sry for that but useroth said i can if i need to

* interface fixes + cleaned trash.

* fixesss

* more fixes

* other interface fix and im dumb

* text and fonts fixes

* mapfixes

* small item fix

* floppa my beloved

* fixme

* yepp

* little addition to vibrator

* more user friendly toys

* hotfix because im dumb

* informing user about stuff happening in their genitals

* Fixed strip menu for new slots

* Vibrating toys now makes constant vibration sounds.

* fucking ton of fixes, i debugged so much stuff i want to die when did i slept last time

* signal vibrator fixes

* i guess its all bugs for now, need testing

* hotfix

* chemicals fixed. other dumb bug fixed too

* feex

* undo

* aight, some text stuff

* repsrited signal vibrator, fixed some dumb bugs. Almost ready for tommorrow pr.

* tried to fix things, need to test

* fixed?

* maybe now its fixed

* we finished here.

* yeah, credits. I forgot them.

* Oh well, resolved the conflict wrong.

* map fixed

* formatting test

* more linter stuff

* did changed that skyrat asked me to

* kinda fixed more stuff

* remove mapchanges

* no magic like kat magic

* please

* further mapchanges removal

* fix

* little fix, because one map supposed to be changed.

* quick structure fixes + balance stuff

* some fixes. remind - fix worn tomorrow.

* ah fuck it, i fixed it now. Who need sleep anyway?

* furnitures are no longer invuln

* fixes poles

* milking machine uses cuffs instead

* makes stuff uses cuffs

* frick

* fix lints

* stuffe

* line

* Forgot to add this little feature

* OKAY FINE I GUESS 10 MINUTES IS TOO MUCH.

* squashed bugs

* minor fix to prevent visual bugs with pillow piles.

* frick

* removed logging

* pref for toys

* tabs

* suggested idea added

* hot fix

* Revert "suggested idea added"

This reverts commit 33796f0abb896b83d02dbefee4e3b62df5f6a5db.

* Revert "hot fix"

This reverts commit bf0bc6330f5897ce2d67bb9571eb818d3a64325b.

* fuck the suggestions, i just want it to work fine

* fuck the suggestions, i just want it to work fine

* truly fixes lints

* balance tweaks + fleshlight fixed

* more balance tweaks

* gasmask fixes. Now it doesn't kill people but still makes them suffer

* fix ball mittens

* dead people tell no tales

* some minor fixes

* grammars

* add messages

* use a new pref

* simple check

* knock-knock. Who? A fix.

* fuck

* fixes vibrators

* hexacrocin now can be cured properly

* fix x_stand

* frick

* FUCK

* fixes everyonr being horny

* fixes pain

* fixes strapon

* stop process

* nymphomania fixed

* fix spam

* fixed heels and quirks

* Dead people shouldn't cum

* Knock-knock. A penis enlarger fix

* use the traits goddamn it

* Nymphomania fix

* Fucking moths can't now chomp vibrators

* Added yes/no check to climax button, also some improvements and multiple messages bugfix

* milking machine balance tweaks, bimbo trauma fix

* milking machine construction messages added

* some fixes

* Revert "Fucking moths can't now chomp vibrators"

This reverts commit 2bf37ca3b0b98c3bbd7bf35626faa7a0be54fcfb.

* little clean up of code, but it still doesn't works properly

* fuck the moths. You can't eat vibrators once more.

* catsuit bug fix

* balance tweaks

* Pillows now made of cloth, not metal.

* pillow fixes

* masochism quick fix

* dumb quickfix, it will break anything, don't panic

* yay now it works again

* nymphomania fix

* clean up

* half of ball mittens fix. For another half buy our DLC just for 2,99$!

* IM COOL I FIXED THE BALL MITTENS! FINALLY!

* prefs now works properly

* pain stuff fixed, i guess. no more arousal by decompression damage.

* lol how did i missed those

* can't buckle fucking cows to milker anymore

* oops

* me cool

* fixed small bug with pillows

* gasmask quick fix

* fix spam

* fixes strapon

* balance stuff.

* fix because im dumb

* fix

* the last fix for this codebomination. I hope this is it.

Co-authored-by: Katherine Kiefer <sterlite2902@gmail.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
2021-08-13 19:33:44 +02:00
AxieTheAxolotl
5c723cbd63 [SEMI-MODULAR] Command Clothing Vendor (#7472)
* guh

* update icon

* added more of the shitty HOS' clothing

* added qm's furcoat to vendor

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* space

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>

* added vendor to journey

* fix this fucking merge

* MERGE PLEASE

* Revert "MERGE PLEASE"

This reverts commit b212932e730f1263ca6d10faa10d2066ffac9859.

* Revert "Merge branch 'command_vendor' of https://github.com/axietheaxolotl/Skyrat-tg into command_vendor"

This reverts commit b7623a5cd8c999ae43bc56cc78cc188b1d298831, reversing
changes made to 501a0b274e8e084357603ee9f0d0519d48d3e186.

* Revert "Revert "Merge branch 'command_vendor' of https://github.com/axietheaxolotl/Skyrat-tg into command_vendor""

This reverts commit 33700cd6cfbc147657a6bb9b1651ef8c775b53b8.

* nukes old hop parade armour

* funny conflict meme

Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-08-12 22:46:01 +01:00
SkyratBot
d2d89a863a [MIRROR] [Ready] Mining Loot Rework (#7461)
* [Ready] Mining Loot Rework

* AAAA

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-10 16:12:36 +01:00
SkyratBot
b6cd89f757 [MIRROR] Kitchen expansion part 2: Ovens (#7474)
* Kitchen expansion part 2: Ovens (#60515)

Adds Ovens

Co-authored-by: MonkeyThatCodes <monkey>
Co-authored-by: tralezab <spamqetuo2@ gmail.com>
Co-authored-by: MonkeyThatCodes <MonkeyThatCodes@ deez.com>
Co-authored-by: Krysonism <robustness13@ hotmail.com>

* Kitchen expansion part 2: Ovens

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: tralezab <spamqetuo2@ gmail.com>
Co-authored-by: MonkeyThatCodes <MonkeyThatCodes@ deez.com>
Co-authored-by: Krysonism <robustness13@ hotmail.com>
2021-08-10 15:50:45 +01:00
jjpark-kb
70161f7c62 [semi-modular] reagent forge (#6643)
* start of reagent forging

* reagent forging

* add the three items to ashwalker den

* try again

* ore smelting, and more

* sorry trace, buffs primitive

* more changes

* gosh, camelCase will always be the best
2021-08-08 23:20:19 +01:00
SkyratBot
78a89af660 [MIRROR] Fixes wirecutters worn belt-state. (#7422)
* Fixes wirecutters worn belt-state (#60683)

* Fixes wirecutters worn belt-state.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2021-08-06 05:10:24 +01:00
SkyratBot
c088c0244f [MIRROR] Makes the occupational corruption device less cryptic (#7421)
* makes the occupational corruption device less cryptic (#60685)

Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>

* Makes the occupational corruption device less cryptic

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
2021-08-06 05:10:19 +01:00
SkyratBot
91070a797c [MIRROR] Job refactor 2: less hardcoded lists (#7410)
* Job refactor 2: less hardcoded lists

* CRITICAL DEP 1

* CRITCAL DEP 2

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-06 01:42:53 +01:00
linnpap
ec338ddce6 [SEMI-MODULAR] Wrestling Rings (#7352)
* wrestling rings

* can now tackle off of the turnbuckles

* muh linters check

* jesus fucking christ

* Update wrestlingring.dm

* changed location of comments

* moreeeeeeeeeeee fixesssssssss
2021-08-05 13:21:17 +01:00
SkyratBot
bce50c3a84 [MIRROR] Deployable Component (Big Dakka Included) (#7380)
* Deployable Component (Big Dakka Included) (#60554)

* Deployable Component (Big Dakka Included)

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-08-04 15:08:40 +01:00
SkyratBot
b2afeb7d0b [MIRROR] Standard bananium floor is now viable for clown decoration. It doesn't slip. (#7378)
* Standard bananium floor is now viable for clown decoration. It doesn't slip. (#60585)

* Standard bananium floor is now viable for clown decoration. It doesn't slip.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-04 15:08:22 +01:00
SkyratBot
6c31c045a8 [MIRROR] Improves and documents some grenade-related code, fixes an exploit. (#7338)
* Improves and documents some grenade-related code, fixes an exploit.

* Update tape.dm

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-03 23:59:32 +01:00
Seris02
f3585b55a6 [NON-MODULAR] fixes things so that classic (including peacekeeper) batons can stamcrit again (#6995)
* IT CAN STAMCRIT AGAIN WOO

* adds a skyrat comment
2021-08-03 21:45:20 +01:00
SkyratBot
3b8697378c [MIRROR] Fixes infinitely recursive beef wellingtons (#7362)
* Fixes infinitely recursive beef wellingtons (#60658)

* Fixes infinitely recursive beef wellingtons

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-08-03 21:26:19 +01:00
SkyratBot
61aa9c09cf [MIRROR] Improves Pavlova Code Copypasta, Changes Description Of Pavlova (The Pavlova Incident of 2021) (#7350)
* Improves Pavlova Code Copypasta, Changes Description Of Pavlova (The Pavlova Incident of 2021) (#60595)

* Improves Pavlova Code Copypasta, Changes Description Of Pavlova (The Pavlova Incident of 2021)

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-08-03 20:06:30 +01:00
SkyratBot
f942963ce3 [MIRROR] componentized spirit item possession (#7346)
* componentized spirit item possession (#60614)

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

* componentized spirit item possession

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-08-03 20:06:06 +01:00
SkyratBot
92537c9856 [MIRROR] Fixes perspective issue with classic baton (#7291)
* Fixes perspective issue with classic baton (#60517)

* Fixes perspective issue with classic baton

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-08-01 11:42:20 +01:00
SkyratBot
69b351d105 [MIRROR] Fixes e-bolas being unblockable and not ensnaring flying mobs. (#7264)
* Fixes e-bolas being unblockable and not ensnaring flying mobs. (#60160)

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

* Fixes e-bolas being unblockable and not ensnaring flying mobs.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-08-01 11:40:28 +01:00
BluBerry016
202484c782 [Modular] NSS Journey Update + Service Airlocks (#7262)
* service airlocks

* Update NSSJourney.dmm

* Update NSSJourney.dmm

* Update NSSJourney.dmm

* Update NSSJourney.dmm

* Update NSSJourney.dmm

* Update NSSJourney.dmm
2021-08-01 11:39:28 +01:00
SkyratBot
7afceb62ad [MIRROR] tcg flippers no longer have the scaling element (#7239)
* tcg flippers no longer have the scaling element (#60424)

* tcg flippers no longer have the scaling element

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2021-07-29 23:44:35 +01:00
SkyratBot
ccc38b0fc4 [MIRROR] Trash Cannons (#7225)
* Trash Cannons (#60476)

* Trash Cannons

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-07-29 11:15:03 +01:00
SkyratBot
9f7d93f3f3 [MIRROR] Remove nanites (#7210)
* Remove nanites

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-29 00:45:17 +01:00
Gandalf
35e087ff2b a 2021-07-28 23:32:53 +01:00
Edgar-Allan-ShitPoest
3ed06e7983 Ronin Curator bundle (#7187)
* Curator Katana

* Add's ronin hero box
2021-07-28 23:28:55 +01:00
SkyratBot
a671213d5d [MIRROR] Fixes the map sprite for lizard plushes (#7204)
* Fixes the map sprite for lizard plushes (#60416)

This PR fixes the placeholder map sprite for lizard plushes. I included a map sprite in my original GAGS PR but I forgot a single character from the icon_state which made it not work and I didn't realize until after it was merged.

* Fixes the map sprite for lizard plushes

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-07-28 23:11:01 +01:00
SkyratBot
8a9ab67aad [MIRROR] That's it. *GAGS'ifies your berets* (#7097)
* That's it. *GAGS'ifies your berets*

* a

* Update head.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 22:21:49 +01:00
SkyratBot
227b722820 [MIRROR] Job refactor: strings to references and typepaths [This could seriously break things :)] (#7006)
* Job refactor: strings to references and typepaths

* 0

* holy fuck

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 21:12:42 +01:00
SkyratBot
a14347bb06 [MIRROR] Dissecting Biddle Traitors: Toned down traitor flavor + antag info tgui (#7084)
* Dissecting Biddle Traitors: Toned down traitor flavor + antag info tgui

* Mirror!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-07-28 20:42:33 +01:00
SkyratBot
ca49a412ca [MIRROR] Lets construction bags be put in pockets like they were intended to (#7184)
* Lets construction bags be put in pockets like they were intended to  (#60460)

* Lets construction bags be put in pockets like they were intended to

Co-authored-by: jughu <melvin2626@live.nl>
2021-07-28 19:04:16 +01:00
SkyratBot
efa9604388 [MIRROR] Fix wallet ID access (#7162)
* Fix wallet ID access (#60449)

* Fix wallets ID access

* Refactor id_card code to be simple

* Refactor id_card even further

* Fix wallet ID access

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-07-28 19:01:28 +01:00
SkyratBot
8c3286d01b [MIRROR] Adds sounds to adjusting the pneumatic cannon (#7188)
* Adds sounds to adjusting the pneumatic cannon (#60470)

* Adds sounds to adjusting the pneumatic cannon

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-07-28 18:59:10 +01:00
SkyratBot
090198f40c Kills the misc items file (#7151)
Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-07-28 18:58:42 +01:00
SkyratBot
20fbe40187 [MIRROR] Makes only mapload foods require players to pick them up to decompose (#7131)
* Makes only mapload foods require players to pick them up to decompose (#60392)

Co-authored-by: Changelogs <action@ github.com>

* Makes only mapload foods require players to pick them up to decompose

Co-authored-by: Wallemations <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: Changelogs <action@ github.com>
2021-07-26 15:48:38 +01:00
SkyratBot
68bd00dd29 [MIRROR] Spraycans actually empty if used below 2 units while colouring lights. (#7130)
* Spraycans actually empty if used below 2 units while colouring lights. (#60395)

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

* Spraycans actually empty if used below 2 units while colouring lights.

Co-authored-by: DomitiusKnack <56321744+DomitiusKnack@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-07-26 15:48:17 +01:00
SkyratBot
a431d06e1e [MIRROR] Fixes difficulties with placing lattices on multiz maps. (#7126)
* Fixes difficulties with placing lattices on multiz maps. (#60124)

Title. Because of mob and object visuals under open space being able to be hovered over with the cursor and examined and in general acting as entities distint from the turf holding them it tends to be hard or even impossible to build floor and catwalks over these turfs. This PR aims to fix it with a basically simple, more-convenient-than-a-painstaking-refactor and easy to apply element (edit: and proc).

* Fixes difficulties with placing lattices on multiz maps.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-07-26 15:47:43 +01:00