Commit Graph

14823 Commits

Author SHA1 Message Date
SkyratBot 57f732eea3 [MIRROR] Re-balances ant damage values & lets you pour ants on the floor (#7999)
* Re-balances ant damage values & lets you pour ants on the floor

* Update others.dm

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-11 16:23:08 +01:00
SkyratBot fb925f81aa [MIRROR] Renames the analyzer to gas analyzer and adds it to the protolathe printable list (#8100)
* Renames the analyzer to gas analyzer and adds it to the protolathe printable list (#61326)

Just this, small QoL because having to build a full autolathe to get a gas analyzer is annoying.
You can now search for gas when looking for the analyzer on the autolathe or protolathe, way more intuitive.

I would rename it from /obj/item/analyzer to /obj/item/gas_analyzer but it would change so many files... another day perhaps...

* Renames the analyzer to gas analyzer and adds it to the protolathe printable list

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-09-11 15:49:52 +01:00
SkyratBot 04302a770a [MIRROR] moves obj_integrity and associated procs to the atom level (#8016)
* moves obj_integrity and associated procs to the atom level

* Feex good

* Whoops forgot the maps

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-10 16:47:01 +01:00
SkyratBot e7f0aeea72 [MIRROR] Fixes window opacity when repainting bug (#8083)
* Fixes window opacity when repainting bug (#61268)

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

* Fixes window opacity when repainting bug

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-09-10 07:44:09 -04:00
SkyratBot 3f5dfff58d [MIRROR] Remove remaining references to research point generation through power generation (#8081)
* Remove remaining references to research point generation through power generation (#61294)

Radiation collectors and tesla coils being able to create research points was removed in 92209dd. This stops references to power-based research point generation from appearing.

Research by power is long gone

Restore flavor to power collecting circuitboards
H/T EricZilla

* Remove remaining references to research point generation through power generation

Co-authored-by: esainane <esainane+github@gmail.com>
2021-09-09 22:53:03 -04:00
SkyratBot 2dc34b171e [MIRROR] Componentizes/Elementalizes Pride Struck Hammer Behavior + Carp'Sie Plushie Behavior (#8032)
* Componentizes/Elementalizes Pride Struck Hammer Behavior + Carp'Sie Plushie Behavior (#60728)

Title, please say hello to the element "chemical_transfer" and the component "faction_granter"

Componentized behavior is easier for admins to make events out of, more modular for code maintainability, lowers the possibility of future copy and paste, set me up with my wife, and more

One of the things I personally like the most about it is the ability for each behavior to properly be described on examine, which I loooooove!

Also, these should be fantasy affixes after the freeze is done

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>

* Componentizes/Elementalizes Pride Struck Hammer Behavior + Carp'Sie Plushie Behavior

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-09-08 16:17:06 +01:00
SkyratBot ed1a537fa8 [MIRROR] Immediately connect on smart pipe reprogram (#8058)
* Immediately connect on smart pipe reprogram (#61134)

* Immediately connect on smart pipe reprogram

Previously, a smart pipe reprogrammed to permit a new direction would
connect to a device or pipe that was added later, but not to any
existing device or pipe.

* Dishonor for my ancestors and shame to my family

* Die alone and unloved

* Immediately connect on smart pipe reprogram

Co-authored-by: esainane <esainane+github@gmail.com>
2021-09-08 15:45:39 +01:00
SkyratBot 6e34600cd5 [MIRROR] restore removed individual logs and place them under LOG_VICTIM category (#8043)
* restore removed individual logs and place them under LOG_VICTIM category (#61256)

it turns out that admins use the removed information in #61179 for faster live in-round logging, I've restored that information under a LOG_VICTIM category that should not interfere with mind-reading and ling absorb text

* restore removed individual logs and place them under LOG_VICTIM category

Co-authored-by: Couls <coul422@gmail.com>
2021-09-07 19:54:33 +01:00
SkyratBot a7d6611e0b Reduces copypasta in emissive code. (#8040)
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-09-07 19:53:49 +01:00
SkyratBot 2b28c14b06 [MIRROR] Adds some new (proper) tables. Also fixes the old reinforced glass table just making a regular metal table bug for the alloys included. (#8009)
* Adds some new (proper) tables. Also fixes the old reinforced glass table just making a regular metal table bug for the alloys included.

* Fixing conflicts and making things work

Co-authored-by: GreatKingWombat <79433629+GreatKingWombat@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-06 22:03:13 -04:00
SkyratBot 09c64622e2 [MIRROR] The Cycling 2.0, Airlocks can now be built in game to cycle and named (#8010)
* The Cycling 2.0, Airlocks can now be built in game to cycle and named (#61226)

You can now edit an airlock control board (both physically and through an RCD) to set the airlock name and what ID it cycles on
Airlocks now say what ID it cycles on when examined
when an airlock is made it takes its circuits set name and ID and updates the cycling
i redid how the cycle_id is updated on creation, so now when an airlock is made and grabbing airlocks with an identical ID to cycle it checks if the other airlocks with that ID needs a reference to the new airlock, and if so, it adds it, so you can add doors back to a cycle system if it breaks
NOTE: unfortunately the way linear airlocks, like the small 2 door airlocks to space, set their links, you cannot repair their cycle this way, you will have to deconstruct the remaining door and rebuild both to cycle again

* The Cycling 2.0, Airlocks can now be built in game to cycle and named

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-09-06 14:29:37 -04:00
SkyratBot 5feca8a1be [MIRROR] Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#7966)
* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#61166)

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* build warning and codermonky's advice.

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* skyrat fixes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:30:35 -04:00
SkyratBot 879c955538 [MIRROR] partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype (#7962)
* partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype

* skyrat fixes

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:05:47 -04:00
SkyratBot 3585818703 [MIRROR] Pig Latin Mutation (#8012)
* Pig Latin Mutation (#61184)

* Pig Latin Mutation

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-09-06 07:55:13 -04:00
SkyratBot 9c628f39c1 [MIRROR] Fixes some incorrect chaplain weapon / hallucination icon states (#7989)
* icon fixes (#61195)

* Fixes some incorrect chaplain weapon / hallucination icon states

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-09-05 22:55:04 +01:00
SkyratBot 76f7f6ec5b [MIRROR] you can now build easels with 5 wood (#8003)
* you can now build easels with 5 wood (#61245)

easel made out wood, easel hold canvas why not be able to make easel?

* you can now build easels with 5 wood

Co-authored-by: jughu <melvin2626@live.nl>
2021-09-05 22:54:25 +01:00
jjpark-kb f4d09856f5 primitive centrifuge (#7973)
* primitive centrifuge

* suggestions
2021-09-05 04:47:21 +01:00
SkyratBot 137d356269 [MIRROR] pAI minor refactor and cyborg PDA code/visual improvements (#7961)
* pAI minor refactor and cyborg PDA code/visual improvements (#61112)

* pAI minor refactor and cyborg PDA code/visual improvements

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-09-03 23:57:25 -04:00
SkyratBot 3a59debce1 [MIRROR] RPD default pipe color change (#7942)
* RPD default pipe color change (#61162)

New default color is green, also grey has been renamed to omni to ease new players without code diving (or changelog reading)
Moved the colors so that green is the first and the omni is the last

* RPD default pipe color change

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-09-03 03:57:10 +01:00
SkyratBot 514ac1f90b [MIRROR] Fixes crowbars hitting toilets when opening the cistern (#7939)
* Fixes crowbars hitting toilets (#61171)

fixes #61125
It returns an attack chain cancel now

* Fixes crowbars hitting toilets when opening the cistern

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-09-03 03:56:36 +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 c3ec32437a Many smart pipe fixes (#7849)
Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 17:59:33 +01:00
Pinta dcd0c70a8d [NONMODULAR] Makes Mediguns fit in CMO suit storage and makes Medicells fit inside belts. (#7852)
* labcoats and winter coats

* Medigun can now fit in medical hardsuits

* Update belt.dm

* switches it to CMO clothing only
2021-09-01 17:43:58 +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
SkyratBot 146469e37e [MIRROR] Fixes some unnecessary attack chain cancels (#7910)
* Fixes some unnecessary attack chain cancels (#61038)

Replaced attack chain cancels on some objects with parent calls

* Fixes some unnecessary attack chain cancels

Co-authored-by: GoblinBackwards <kinggreenyoshi@gmail.com>
2021-09-01 16:50:47 +01:00
SkyratBot a8a2af902b [MIRROR] Adds a stack trace for objs with <=0 integ taking damage (#7909)
* Adds a stack trace for objs with <=0 integ taking damage (#61079)

Adds a stack_trace to <=0 integ objs taking damage so instances of people relying on this early return prior can be identified

* Adds a stack trace for objs with <=0 integ taking damage

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-09-01 16:50:32 +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 133633ac90 [MIRROR] Objective-specific equipment will always be given. (#7862)
* Objective-specific equipment will always be given.

* Update datum_traitor.dm

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:43:53 +01:00
SkyratBot 9290399403 [MIRROR] Uses regex datums and macros for text-manipulation (#7805)
* Uses regex datums and macros for text-manipulation (#61042)

* Uses regex datums and macros for text-manipulation

* a

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:28:56 +01:00
SkyratBot 0562c7e837 [MIRROR] Fix pass-by-ref issue causing ID card access lists to be incorrectly mutated. (#7906)
* Fix pass-by-ref issue causing ID card access lists to be incorrectly mutated. (#61117)

stored_card.GetAccess() eventually leads to /obj/item/card/id/GetAccess() being called. This proc returns the actual access list associated with the ID card rather than a .Copy() of it.

As a result, the line total_access = stored_card.GetAccess() is storing a reference to the stored_card's actual access list.

total_access |= card_slot2.stored_card.GetAccess() is then mutating the first ID card's access list via the reference.

The result? When /obj/item/computer_hardware/card_slot/GetAccess() is called with 2 ID cards in a modular computer, the second ID card gives all of its accesses to the first ID card thanks to the |= operation.

There are a number of ways around this. Some pieces of code do var/list/thing = list() and then |= every GetAccess() since it's guaranteed to return a list. This creates new lists instead.

However, I feel GetAccess() for ID cards really shouldn't be returning a ref to the list. Instead, it now returns a Copy() of the list and code implementing behaviour using GetAccess() doesn't need to worry about list mutation at all.

* Fix pass-by-ref issue causing ID card access lists to be incorrectly mutated.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-09-01 15:58:37 +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 7db133c470 [MIRROR] Get your protein fix here (for monkey meat). (#7880)
* Get your protein fix here (for monkey meat). (#60696)

Meat steaks now have the material flag to un-link from from material effects, meaning that monkey meat will now have the proper nutrients and reagents it was intended to, primarily that monkey meat will have protein for cytology purposes.

(Basically, the meat mat was not adding a food component, but then trying to remove "any" food component regardless of a material_no_effects flag. Kinda a mess, and maybe this could be done in an event based way, but this is a real sane fix. The hard part was tracking down the error anyway. Kudos fictional arcane who will read this commit message)

* Get your protein fix here (for monkey meat).

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2021-08-31 20:25:46 +01:00
SkyratBot 9741052c65 [MIRROR] fixes wormhole jaunter portals floating in space. (#7878)
* fixes wormhole jaunter portals floating in space. (#61089)

* fixes wormhole jaunter portals floating in space.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-31 20:25:01 +01:00
SkyratBot 9226d7c702 [MIRROR] Fix Sparkler typo (#7876)
* Fix Sparkler typo (#61102)

* Fix Sparkler typo

Co-authored-by: esainane <esainane+github@gmail.com>
2021-08-31 10:37:12 -04: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
AxieTheAxolotl 020b987334 yuh (#7831) 2021-08-28 23:52:57 +01:00
AxieTheAxolotl 765ce3e285 [MODULAR] Readds Peacekeeper lockers with animation (#7704)
* have I told you the definition of insanity

* Update closet.dmi

* dm is a shitty coding language

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

* yuh

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
2021-08-28 02:08:58 +01:00
FlamingLily c0b967f2b4 De-snowflakes latejoin on-station code, latejoin borgs now sync properly, see #6472 (#7742)
* Revert "aaaa (#6451)"

This reverts commit f11bf3faf0.

* onstation latejoin stuff

* linking to parent AI

* test

* de-snowflaking

* Update code/modules/jobs/job_types/cyborg.dm

* Update code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update cyborg.dm

Co-authored-by: SpaceVampire <46720418+SpaceVampire@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-28 02:02:22 +01:00
SkyratBot 532052e080 [MIRROR] bane component to element. nullrod now uses it for revenants. (#7806)
* bane component to element. nullrod now uses it for revenants. (#60640)

* bane component to element. nullrod uses it for revenants.

* TRUE to FALSE

* bane component to element. nullrod now uses it for revenants.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-27 10:44:38 -04:00
SkyratBot 3f9eeb55b9 [MIRROR] Fix crayon text input (#7779)
* Fix crayon text input (#61002)

The regex expression being used missed some symbols and screwed up spacing.

* Fix crayon text input

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-08-26 22:46:57 +01:00
Zephyr 12b1ddec46 [CI] Several Bug Fixes (#7766)
* fix hypospray bad init

* fix bad init for liquid abstract

* update this to pass correct params

* remove an unused element that
isnt even used correctly anyway

* fix hard del on cargo console
maybe fix cluwne
2021-08-25 16:46:18 -04:00
SkyratBot f5f209b147 Fixes cable merging, changes merging code just a little bit (#60997) (#7746)
Makes stack code support merging two different stacks with the same mats, but different mats_per_unit numbers by implementing averages.

It's in an attempt to support the stupid efficiency shit that protolathes do. It's not great, but it ought to work alright for now. Kinda a bandaid
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
2021-08-25 01:30:35 +01: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
Yawet330 7d22d33868 a (#7683) 2021-08-21 22:38:12 +01:00
Deek-Za 2f6aa64b75 Addition: Security Gun Vendor Circuit (#7678)
* Adds Gun Vendor Circuit

This adds a circuit for the weapons vendor

* Update code/game/objects/structures/crates_lockers/closets/secure/security.dm

Co-authored-by: AxieTheAxolotl <86872535+axietheaxolotl@users.noreply.github.com>

Co-authored-by: AxieTheAxolotl <86872535+axietheaxolotl@users.noreply.github.com>
2021-08-21 22:37:52 +01:00
AxieTheAxolotl 897c1f0db3 round2electricboogaloo (#7612) 2021-08-21 22:24:46 +01:00