Commit Graph

13229 Commits

Author SHA1 Message Date
SkyratBot
d349b495fb [MIRROR] Replaces bees and hivelord MOUSE_OPACITY_OPAQUE with a component. (#7955)
* Replaces bees and hivelord MOUSE_OPACITY_OPAQUE with a component. (#61032)

I have replaced the mouse opacity setting for bees and hivelord, its brood and legion skulls with a component that adds an almost (has to be 1 alpha to catch the click) invisible underlay to its target that doesn't block the entire turf.
The component prevents the underlay from shrinking or expanding above/below certain boundaries when the attached atom transform matrix is vv'd by an admin or if it's a mob being resized.
The component can be added to any atom, though there's no common signal for when objects are resized.

* Replaces bees and hivelord MOUSE_OPACITY_OPAQUE with a component.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-09-03 22:55:59 +01:00
SkyratBot
32a9bd8424 [MIRROR] Fixes mousetraps causing mice to become invisible when splatted (#7954)
* Fixes mousetraps causing mice to become invisible when splatted  (#61201)

* Fixes mousetraps causing mice to become invisible when splatted

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
2021-09-03 22:55:50 +01:00
SkyratBot
ec70f7ad15 [MIRROR] Adds in asexual-themed socks. (#7943)
* Adds in asexual-themed socks. (#61175)

Adds in the asexual socks, called the ace socks because i like the abbreviation as it makes it sound cooler.
Also fixes bee socks being ordered improperly in the code.

* Adds in asexual-themed socks.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-09-03 03:57:14 +01:00
SkyratBot
62f195e482 [MIRROR] Cayenne can now strip people (#7936)
* Cayenne can now strip people (#61160)

Cayenne was given the ability to pick up the disk in their mouth with #57395, which also gave them the trait advancedtooluser for them to strip.
A while later, the ability to strip people was moved to a separate trait, which removed Cayenne's ability to strip.
This PR restores that functionality, and also makes Cayenne able to drop the nuke disk without deleting it.

Also cayenne putting the nuke disk down would runtime and just delete the disk entirely, so this fixes that also.

* Cayenne can now strip people

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-09-03 03:56:18 +01:00
SkyratBot
302798dbb7 [MIRROR] [s] Audits object say() uses to make handling text more safe (#7927)
* [s] Audits object say() uses to make handling text more safe (#61147)

Made all say()s deal with encoding, audited all uses of say() to prevent double encoding or like, manually inserting span().
I left some stuff without sanitize that only draws from the code, since it's hell to clean up otherwise. That
and I let admins do whatever the fuck they want

* [s] Audits object say() uses to make handling text more safe

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-09-02 15:57:10 -04:00
SkyratBot
c040bab62e [MIRROR] Fixed the Bloodcrawl spell not ejecting users if somehow lost. (#7918)
* Fixed the Bloodcrawl spell not ejecting users if somehow lost. (#61076)

* Fixed the Bloodcrawl spell not ejecting users if somehow lost.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-09-02 03:13:33 +01:00
SkyratBot
eb8ed21f06 [MIRROR] Fixes a plasmaman autoignition oversight (#7912)
* Fixes a plasmaman autoignition oversight (#61083)

Adds a check to see if there are any organic plasmaman limbs or any plasmaburnt limbs (which are obtained by exposure to plasma lava on icebox) before igniting plasmemes so that a plasmeme with fully replaced limbs can stop burning

* Fixes a plasmaman autoignition oversight

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-09-01 18:18:12 +01:00
nikothedude
a8be3bf064 Enables sec/med huds to view records on examine, as well as antagonists being able to view exploitables. (#7859)
* R.field

* i hate modularization

* AAAAAAAAAAAAAAAAAAAAAAAA

* agony

* almost done

* h

* Delete admins.txt

* Add files via upload

* Update and rename admins.txt to config/admins.txt

* Update admins.txt

* rwrwawdaw

* fuckfuckfuck

* Apply (safe) suggestions from code review

not committing all of them, gonna test them on my PC first

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

* asaaaaaaaaaa dont merge this aaaaaaaaaaa

* i hate gitignores with a passion./

* HATE> HATE GITIGNORE.

* final tweaks

* quite possibly the worst code i have ever written

* i forgot to remove this comment

* prefs

* THE SPAGHETTI CODE IS GONE (also more maintainable)

* Update readme.md

* why was it unticked

* more maintainability

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-01 12:18:56 -04:00
GoldenAlpharex
31b3a9331e [MIRROR] Replaced the lobby menu (with actual art) (#60953) (#7748)
* Replaced the lobby menu (with actual art) (#60953)

* a

* a

* Update new_player.dm

* Update new_player.dm

* Update new_player.dm

* a

* a

* Update new_player.dm

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 17:07:48 +01:00
SkyratBot
b267e1922b [MIRROR] Fixes being able to spam ghost role notifications. (#7904)
* Fixes being able to spam ghost role notifications. (#61085)

There are methods that let players spam the everloving shit out of ghosts with BONG BONG BONG BONG BONG BONG BONG etc. through being able to constantly poll ghosts for roles with no restriction or cooldown.

Examples are laughter and slaughter demon antag_spawners.

It makes no sense to be able to concurrently poll for the same mob. As a result, I've now added a guard against this. The proc has been given a static list of mobs it's polling for ghost roles for. If it's already polling for ghost roles for a given mob, then it just early returns with an empty list, otherwise it adds the mob to the static list when the poll starts and removes it when the poll ends.

I've also done a little cleanup in var names and the proc name, with a find-and-replace done. There weren't many things calling it and none used named keywords in the args so should be fine.

There is also poll_candidates_for_mobs (also included in my cleanup) - This proc is basically only called by admins via sentience balloons and they have their own guards against spamming (the balloon pops and thus can only be used once)

Also fixes an issue in /mob/living/silicon/robot/proc/replace_banned_cyborg() where incorrect args were used in the proc call to poll for candidates.

* Fixes being able to spam ghost role notifications.

* a

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 17:00:32 +01:00
SkyratBot
f1503016c5 [MIRROR] lava and weather immunities refactor (also jump boots fix) (#7893)
* lava and weather immunities refactor (also jump boots fix) (#61003)

In remembrance of all those people who used jump boots to cross lava unaware of an issue c*ders wouldn't fix....

EDIT: This is now a lava and weather immunities refactor:
Weather immunities are now status traits since they have a multitude of sources (especially for lava) which might conflict with one another otherwise.
The lava burn_stuff proc has also been been refactored in different procs, mostly because of that snowdin subtype with inconsistent, old checks.
Weather datums should now use can_weather_act instead of weather_act to check if something can be affected by weather or not, as they should.
All movables can protect contained mobs if they have the relative weather immunity traits. This works at any contents depth.
No more snowflake weather_protection variable for closets.
Removed the weather_immunities list from living mobs (simple animals still have it but it's only for traits assignment on init because way too many child types lack the immunities of their parents).
Removed some unused defines.
Renamed some variables as per guidelines.
It has been tested.
And yea, jump boots fixed because that's the original scope of this PR.

(Initially just made throwing make you fire immune, that was blocked because it breaks perma stuff, instead it ended up be a refactor to make jumpboots usable with weather immumnity stuff

* lava and weather immunities refactor (also jump boots fix)

* Update Ashwalkers.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:58:10 +01:00
SkyratBot
7c20242e85 [MIRROR] fixes misspellings of "aggressive" in a few areas. (#7869)
* fixes misspellings of "aggressive" in a few areas.

* aa

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:54:51 +01:00
Useroth
f900b1ec6d [MDB IGNORE] Eliminates Toxins (#60619) (#7911)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:50:22 +01:00
SkyratBot
02ad59791b Basic Mobs: the cooler simple mobs that run on datum AI. (With reworked cockroach AI as proof of concept) (#7867)
Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:47:39 +01:00
SkyratBot
eedc63bbff [MIRROR] tgui: Silicon Station Alerts (#7847)
* tgui: Silicon Station Alerts

* 0

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:38:53 +01:00
SkyratBot
af77d1434a [MIRROR] changed minor typo in ventcrawling.dm (#7907)
* changed minor typo in ventcrawling.dm (#61104)

changed "You out from the ventilation ducts." to "You scramble out from the ventilation ducts." to match the visible_message.

* changed minor typo in ventcrawling.dm

Co-authored-by: magatsuchi <88991542+magatsuchi@users.noreply.github.com>
2021-09-01 15:58:48 +01:00
SkyratBot
eae7233c5b [MIRROR] small refactor to can_interact() so that borg range is fully respected (#7891)
* small refactor to can_interact() so that borg range is fully respected (#60693)

Its a relatively small refactor that changes the previous machinery "can_interact()" proc that literally did a full override despite half of their checks already existing in not one, but TWO parent procs, so i removed the redundant checks, added callbacks to its parents and then added the cyborg range check on the can_interact_with() itself. in doing so i also moved the interaction range var from silicons only, to mobs as a whole and defaulted it to a single tile, silicons override it to 7 (so pAIs and borgs like before) but then set AI and AI.eye to "null", because i have a check in can_interact that if there is no range set, then the range is effectively unlimited. and i even added code for when AI is carded and their wireless transmission is disabled it sets their range to "0" aka, it has no range to do anything even if it could

this was really complicated for me so despite my extensive testing it probably would be a bad thing if any of you want to test my code yourself to ensure there isnt a bug with this (theres no runtimes ive come across)

note: i did a lot of searching and going through machinery to ensure i caught all the little snowflake overrides and added can_interact() checks to them, but i may have missed one or two things, especially maybe a altclick or ctrlclick somewhere, however i believe i caught most of them

one nice side effect of this refactor is that you can actually set another mobs range to something other than 1 tile and they can interact at range, rather than only silicons getting this ability, an admin could VV a human to have a 3 tile arm reach as a meme if they want

* small refactor to can_interact() so that borg range is fully respected

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-08-31 20:26:36 +01:00
SkyratBot
4ee6821652 [MIRROR] Fix female uniforms not updating color correctly (#7872)
* Fix female uniforms not updating color correctly (#61040)

Fixes #59235, fixes #59297, fixes #61012, and other similar bugs.
The global list of female uniforms now appends the greyscale color of the uniform to the index/name, so all GAGS female uniforms are unique and handled correctly.

* Fix female uniforms not updating color correctly

Co-authored-by: Shroopy <delyth@shroop.net>
2021-08-31 20:24:17 +01:00
SkyratBot
706971fa68 [MIRROR] Fixes floored mobs (paraplegia, missing limbs) not being able to stand up in zero G for real. (#7889)
* Fixes floored mobs (paraplegia, missing limbs) not being able to stand up in zero G for real. (#61054)

Added a old_movement_type argument to the COMSIG_MOVETYPE_FLAG_ENABLED and COMSIG_MOVETYPE_FLAG_DISABLED signal, fixed the check for zero g movespeed and locomotion traits removal and made some statements easier to understand.

* Fixes floored mobs (paraplegia, missing limbs) not being able to stand up in zero G for real.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-31 20:21:51 +01:00
SkyratBot
1eedba48a0 [MIRROR] Hostile mobs will always face their targets when shooting. (#7886)
* Hostile mobs will always face their targets when shooting. (#61069)

Added a face_atom call with targeted_atom as arg.

* Hostile mobs will always face their targets when shooting.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-31 20:21:18 +01:00
SkyratBot
5a28dbc61d [MIRROR] Naive works correctly on simple animals (#7868)
* Naive works correctly on simple animals (#61088)

About The Pull Request
Innocent clowns now perceive dead animals as asleep, the same as humans.

* Naive works correctly on simple animals

Co-authored-by: YakumoChen <king_yoshi42@yahoo.com>
2021-08-30 22:16:31 +01:00
SkyratBot
5169789861 [MIRROR] Refactors and improves SDQL spells (#7854)
* Refactors and improves SDQL spells (#60972)

SDQL spells have been improved in several ways:

- The behavior of executing SDQL spell queries using datums has been migrated to a component
- Projectile SDQL spells can now fire any subtype of /obj/projectile
- Touch SDQL spells can use any subtype of /obj/item/melee/touch_attack
- More robust parse error detection
- Parse errors while loading a file from json are displayed in a modal window, with the option to load whatever parts of the spell were correctly parsed (be forewarned, scrollable sections are scuffed, and the ones that appear in the parse error modal can only be scrolled through by drag-selecting the text within them)
- Fixes a bug with the names of variables within lists
- Compartmentalizes SDQL spell code into several .dm files.

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

* Refactors and improves SDQL spells

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-08-29 23:00:33 +01:00
SkyratBot
854122a5ac [MIRROR] Small Spider Balance Changes and Tarantula QoL (#7851)
* Small Spider Balance Changes and Tarantula QoL (#60505)

* Add Sealed Webs

* Add Sealed Web Icon

* Spider Changes

* Update this dumb var

* Make Broodmothers spawn in the same place

* Remove unused var

* Re-Add Sealed Web Sprite

* Small Spider Balance Changes and Tarantula QoL

Co-authored-by: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com>
2021-08-29 22:03:34 +01:00
SkyratBot
d7ad667098 [MIRROR] roundstart offstation antagonists (wizards, nuke ops...) no longer have quirk assigned to them. (#7747)
* roundstart offstation antagonists (wizards, nuke ops...) no longer have quirk assigned to them. (#60987)

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

* Updates the job_flags for the Skyrat jobs

* Whoops, forgot to remove an unused var

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-08-29 00:44:27 +01:00
SkyratBot
1219e433be [MIRROR] Refactor area and turf lighting (#7775)
* Refactor area and turf lighting

* AAAAAAAA

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-29 00:43:40 +01:00
jjpark-kb
2b421fc26b okay, venus cant hit all the time now (#7838) 2021-08-28 23:54:24 +01:00
SkyratBot
68e9516597 [MIRROR] colossus-type projectiles no longer explode sealed vehicles (#7832)
* colossus-type projectiles no longer explode sealed vehicles (#61030)

* colossus-type projectiles no longer explode sealed vehicles

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2021-08-28 10:00:36 -04:00
Tom
f2f1d8beb2 Organic Interface Update Spelling and Grammar Cleanup, or: How I Learned To Hate Myself (#7701)
* Sex 2 Spelling and Grammar Cleanup, or: How I Learned To Hate Myself

* Fix

* C

* suggested changes

* *rolls up sleeves* Fine, I'll do it myself

* Oop-

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm

* Funny Regex time

* fix

* Unclosed tags, nice. And also newlines

* Oop

* 1 spaces, two spaces... my regex isn't that flexible please

* And I'm using old regex too

* Update modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_gloves.dm

Co-authored-by: Funce <funce.973@gmail.com>
2021-08-28 02:12:58 +01:00
jjpark-kb
12f795f23d venus changes (#7692)
* venus changes

* better looking code

* suggestion

* one small forget
2021-08-28 02:11:17 +01:00
FlamingLily
4bde6f5e2a Changes corpse examine text to be more RP friendly. (#7744)
* let's do it again gamers

* Update human_helpers.dm
2021-08-28 02:00:35 +01:00
jjpark-kb
9328045afd cyborg buff (service) (#7560)
* cyborg buff

* yea

* span_notice changes

* remove the welder portion

* forgot the readme

* Update modular_skyrat/modules/borg_buffs/code/robot.dm

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

* golden pleaser

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-25 19:57:09 -04:00
SkyratBot
c7f3dd5b20 Makes the slime link function on stargazers behave as intended (#7736)
Fixes an issue with Stargazers where they were unable to form slime links.

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2021-08-24 10:21:36 -04:00
SkyratBot
36f173ed03 [MIRROR] Fix item stacks qdeling themselves in Init and some item stack self-merge scenarios. (#7655)
* Fix item stacks qdeling themselves in Init and some item stack self-merge scenarios. (#60835)

* Feex

* Fix stack self-merging thanks to connect_loc

* Better doc

* Cyborg item stack qdel issue

* Shut up linter :)

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-08-22 01:19:04 -04:00
candle :)
33f9be2c42 [READY] [MOSTLY MODULAR] Vox sprite fixes, updates, and additions (#7522)
* [DRAFT} Vox sprite fixes, updates.

* spriiiiiiite fiixeeesssss

* sprite name fix

* part one

* PART 2

* modularization moment
2021-08-22 01:40:28 +01:00
SkyratBot
f76747d3cc span fixes (#60936) (#7686)
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-08-21 22:14:57 +01:00
jjpark-kb
6dfd617177 fixes some of the issues of the createanddestroy unit test (#7648)
* send help

* polychromic createanddestroy fix
2021-08-20 23:23:23 -04:00
SkyratBot
93a298569d Adds a qdeleted check to mob equipping. This fixes potential runtimes/harddeletes caused by attempting to add (#60902) (#7651)
stacks to a slot, since stacks will commonly self delete, even if you add them to different slots. This is
because stack code does not respect slots, and I can't figure out a good way to fix that outside of this.

Also fixes like, a 2% chance unit test failure caused by a mob spawner that has a low percent chance to spawn a
miner with cash in both pockets. I hate god.

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-08-20 18:52:16 +01:00
SkyratBot
84dfef16da Fix fire exploit being extinguished by pAIs, borgs, and simple animals (#60852) (#7649)
* Fix fire being extinguished by pAIs, borgs, and simple animals

* Add trait TRAIT_NOFIRE_SPREAD

* Add NOFIRE_SPREAD traits to simple and silicon mob types

* Refactor spreadFire proc to use check TRAIT_NOFIRE_SPREAD

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-08-20 06:33:59 -04:00
SkyratBot
b95cc44e35 Fix mulebot movement while controlled by a player (#60909) (#7636)
Co-authored-by: Tim <timothymtorres@gmail.com>
2021-08-19 14:25:08 -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
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
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
SkyratBot
d4e11d2080 [MIRROR] Redoes how alarms are handled, moves their behavior to datums (#7547)
* Redoes how alarms are handled, moves their behavior to datums

* a

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-15 23:38:01 +01:00
SkyratBot
a1c7bd4bae [MIRROR] knockback component to element. (#7542)
* knockback component to element.

* Update tgstation.dme

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

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

* Update freezer.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-15 23:09:21 +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
Deek-Za
29397dbfdb Fixed CDO Access (#7575)
Honestly. This has been overdue for months. CDO can finally do their job without risking access to the equipment or detective lockers.
2021-08-15 22:51:09 +01: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
SkyratBot
6ca0f0d80c [MIRROR] lifesteal component to element. (#7537)
* lifesteal component to element. (#60632)

* lifesteal component to element.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-13 17:22:49 +01:00