Commit Graph

4135 Commits

Author SHA1 Message Date
SkyratBot
210b17557e [MIRROR] Cytology Adjacent Update #2: Carp scale crafting. [MDB IGNORE] (#8682)
* Cytology Adjacent Update #2: Carp scale crafting.  (#61913)

expansion: Adds carp scales, and carp scale crafting.

* Cytology Adjacent Update #2: Carp scale crafting.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-10-08 07:47:10 -04:00
SkyratBot
cc93b11d23 [MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-06 22:07:01 +01:00
CalamaBanana
63b945ff1f Fixes missing color for undershirt/socks (#8548)
* Fixes missing color for undershirt/socks

Added color choice to undershirt and socks selection.

* Added SKYRAT EDITs

Added SKYRAT EDITs

* Moved a file to the masterfiles

Moved a file to the masterfiles
2021-10-03 23:36:28 +01:00
SkyratBot
2b087cb56a [MIRROR] Getting hit by the tram will now smash people through lattice and unplated flooring [MDB IGNORE] (#8560)
* Getting hit by the tram will now smash people through lattice and unplated flooring (#61709)

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

* Getting hit by the tram will now smash people through lattice and unplated flooring

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-10-02 21:13:58 +01:00
SkyratBot
71456735b6 [MIRROR] Tramstation Fixes [MDB IGNORE] (#8542)
* Tramstation Fixes (#61781)

* fixed directional signs, added maint loot spawns to cargo crates

* forgot the duped stuff lmao

* landmark changes

* atmos pipes removed

* botany disposal pipe

* Tramstation Fixes

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
2021-10-02 00:11:10 +01:00
Gandalf
0b8421f298 Collars the singularity (#8509)
* Collars the singularity

* Update singularity.dm

* Update singularity.dm
2021-09-30 19:54:11 -04:00
SkyratBot
13fe213621 [MIRROR] [MDB Ignore] Make shuttle windows deconstructable [MDB IGNORE] (#8463)
* [MDB Ignore] Make shuttle windows deconstructable

* E

* re

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:21:36 +01:00
SkyratBot
7b3baea1b9 [MIRROR] Ports animated locker doors [MDB IGNORE] (#8453)
* Ports animated locker doors

* 0

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:10:26 +01:00
SkyratBot
f295464c2a [MIRROR] Corrects mapload args that sprug up in the past few days [MDB IGNORE] (#8462)
* Corrects mapload args that sprug up in the past few days (#61759)

See #61623 . These were either merged after the prior PR, coded before the prior PR, or were made in between and not updated.

* Corrects mapload args that sprug up in the past few days

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-09-30 23:01:27 +01:00
SkyratBot
dc77053357 [MIRROR] Fixed holosigns not registering it's projector [MDB IGNORE] (#8486)
* Fixed holosigns not registering it's projector (#61755)

Before the mapload PR got merged, the mapload param got treated incorrectly as the loc param, allowing the proc to work without problems since source_projector is in the right place. But now that the mapload param is implemented here properly, the previous bad implementation turned into a working feature turned back into a bug. This took way longer than it should have.

* Fixed holosigns not registering it's projector

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-09-29 22:24:32 +01:00
SkyratBot
93583cde8c [MIRROR] Fix connect loc not respecting phasing in some cases when it should [MDB IGNORE] (#8451)
* Fix connect loc not respecting phasing in some cases when it should (#61698)

* Fix connect loc not respecting phasing in some cases when it should

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-09-28 16:02:14 +01:00
SkyratBot
e9117f1874 [MIRROR] Fixes the auxiliary base construction console. [MDB IGNORE] (#8452)
* Fixes the auxiliary base construction console. (#61692)

* Fixes the auxiliary base construction console.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-09-28 08:08:11 -04:00
SkyratBot
93675c6c6f [MIRROR] Changes a bunch of New()s to Initialize()s (#8408)
* Changes a bunch of New()s to Initialize()s (#61626)

* Changes a bunch of New()s to Initialize()s

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-09-26 14:27:27 +01:00
SkyratBot
34a6688baa [MIRROR] Removes the placeholder alien bed. (#8411)
* Removes the placeholder alien bed (#61690)

This PR removes the placeholder alien bed and its associated sprite from the game, and replaces its appearance in the snowdin ruin with the actual abductor bed.

* Removes the placeholder alien bed.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-09-26 12:18:13 +01:00
SkyratBot
300570556f [MIRROR] Fixes neglected fern cell ine amounts + reverts undocumented crate spawner change that removed my brand new fern from the game. (#8388)
* Fixes neglected fern cell ine amounts + reverts undocumented crate spawner change that removed my brand new fern from the game. (#61671)

* Fixes neglected fern cell ine amounts + reverts undocumented crate spawner change that removed my brand new fern from the game.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-09-25 04:18:04 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
SkyratBot
be6e303ab2 [MIRROR] Mapping DLC - Random Spawner Pack [MDB IGNORE] (#8344)
* Mapping DLC - Random Spawner Pack [MDB IGNORE] (#60522)

First off, I am aware of the Feature Freeze for this month. This PR was initially started in #60401 about a month ago to break the changes into smaller PRs. The end result for this PR is a poor man's attempt at roguelike procedural generation. Enjoy!

Link to the README for how the new spawner system works.

Added the following new random mapping spawners:

pen, crayon, stamp, paper, pamphlet, briefcase, folder, wardrobe closet, wardrobe closet colored, backpack, narcotics, permabrig_weapon, permabrig_gear, prison, material, carpet, ornament, generic decoration, statue, showcase, paint, tool, tool_advanced, tool_rare, material_cheap, material, material_rare, toolbox, flashlight, canister, tank, vending_restock, atmospherics_portable, tracking_beacon, musical_instrument, gambling, coin, money_small, money, money_large, drugs, dice, cigarette_pack, cigarette, cigar, wallet_lighter, lighter, wallet_storage, deck, toy, toy_figure, booze, snack, condiment, cups, minor_healing, injector, surgery_tool, surgery_tool_advanced, surgery_tool_rare, firstaid_rare, firstaid, patient_stretcher, medical supplies, crate, crate_abandoned, girder, grille, lattice, spare_parts, table_or_rack, table, table_fancy, tank_holder, crate_empty, crate_loot, closet_private, closet_hallway, closet_empty, closet_maintencne, chair, chair_maintence, chair_flipped, chair_comfy, barricade, data_disk, graffiti, mopbucket, caution_sign, bucket, soap, box, bin, janitor_supplies, soup, salad, dinner

Removed deprecated wizard trap, vault, and armory spawners.

* Mapping DLC - Random Spawner Pack [MDB IGNORE]

* HNNGH

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 19:05:55 +01:00
SkyratBot
da3076fa46 [MIRROR] Cytology content expansion: Jungle mobs. (#8335)
* Cytology content expansion: Jungle mobs.

* Update research.dm

* E

* Update frog.dm

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-23 02:36:08 +01:00
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

* https://github.com/tgstation/tgstation/pull/61519

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00
SkyratBot
d1da6f3f34 [MIRROR] Food decomposition can mold stuff into different items, and not just moldy messes. (#8248)
* Food decomposition can mold stuff into different items, and not just moldy messes.

* E

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-19 22:35:14 +01:00
SkyratBot
57e5bab45e [MIRROR] converts cows to basic mobs and ADDS MOONICORNS (#8220)
* converts cows to basic mobs and ADDS MOONICORNS (#61446)

* converts cows to basic mobs and ADDS MOONICORNS

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-19 22:10:20 +01:00
Gandalf
96cb19801d EEE forgot a PLOR 2021-09-14 00:00:44 +01:00
SkyratBot
e510e35167 [MIRROR] [READY] Adds memory system, and engraving walls with chisels (#8066)
* [READY] Adds memory system, and engraving walls with chisels

* EEE

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:36:51 +01:00
SkyratBot
26f934c258 [MIRROR] Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton) (#8076)
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)

* EEEE

* E

* follow the fucking guidelines

* E

* Update CentCom_skyrat.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:27:01 +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
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
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
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
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
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
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
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
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
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
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
death and coding
313a941538 [modular][ready]transfers the old cowboy poncho to the neckslot and adds obj sprites for mantles (#7586)
* [modular][ready]transfers the old cowboy poncho to the neckslot

* blood b gone

* Update cloaks.dm

* FINALLY

* AAAAAAAAAAAAAAAAAAAAA FIXES

* Update neck.dmi

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-08-17 13:46:05 -04:00
SkyratBot
cbeb240fb0 [MIRROR] Fixes a warning that some guy left in freezer.dm code (#7602)
* Fixes a warning that some guy left in freezer.dm code

* Mirror!

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-08-17 15:42:38 +12: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
SkyratBot
9ab3e07909 [MIRROR] freezers will now actually protect their contents from explosions once. (#7579)
* freezers will now actually protect their contents from explosions once. (#60875)

It's supposed to shield contents from explosions, not only itself.

* freezers will now actually protect their contents from explosions once.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-15 22:52:05 +01:00
SkyratBot
d972fc5a15 [MIRROR] brings back barticles for bonfires (#7535)
* Revert "Revert "Barticles for bonfires 2021 (#59869)" (#59916)" (#60469)

* brings back barticles for bonfires

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2021-08-13 02:44:41 +01: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
2ac8378e7e [MIRROR] fixes cannons not working (#7511)
* fixes cannons not working (#60757)

* fixes cannons not working

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2021-08-12 00:57:19 +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
AxieTheAxolotl
0902aaa86e idfk any more man (#7479) 2021-08-10 15:57:15 +01:00