Commit Graph

2257 Commits

Author SHA1 Message Date
Yawet330
c49c546bde [NONMODULAR]Shocks & Zaps, Episode 2 (#4684)
* OH NO

* Update powernet.dm

* ae

* alexia please play despacito

* Update powernet.dm

* Merge branch 'master' into pr/4684

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-10 18:31:05 +01:00
Gandalf
ef42a445bd Engines: Return of the Singularity(and tesla) (#4725)
* LET THERE BE LIGHT!

* Update generator.dm

* aaaa

* Update singularity_effect.dm

* aaaa

* aaaaaaaaaaaa

* Update particle_control.dm

* aaa

* Create readme.md
2021-04-08 16:49:37 +01:00
SkyratBot
1736440cc0 [MIRROR] changes most uses of SSvis_overlays.add_vis_overlay() inside of update_overlays() to true overlays (#4569)
* changes most uses of SSvis_overlays.add_vis_overlay() inside of update_overlays() to true overlays (#57985)

* changes most uses of SSvis_overlays.add_vis_overlay() inside of update_overlays() to true overlays

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-04-01 02:04:42 +01:00
Gandalf
d14f4ea7c9 Revert "Revert "[MIRROR] Layer overhaul (#4503)" (#4509)" (#4536)
This reverts commit b27ede689e.
2021-03-31 02:08:56 +01:00
Useroth
b27ede689e Revert "[MIRROR] Layer overhaul (#4503)" (#4509)
This reverts commit 8ac892d340.
2021-03-30 23:45:08 +01:00
SkyratBot
8ac892d340 [MIRROR] Layer overhaul (#4503)
* Layer overhaul (#57915)

## About The Pull Request
Changes up some layer and plane defines for no particular reason lol

## Why It's Good For The Game
Planes actually override layers, and layers control ordering within planes. A lot of the usage of plane and layer was wholly unnecessary. This refactor helps future maintainability while also being needed staging for _future features._

* Layer overhaul

* aaaaaaaaa

a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-29 16:36:36 +01:00
SkyratBot
c21aab1997 [MIRROR] Adds sticking metallic kitchenware into APCs (#4383)
* Adds sticking metallic kitchenware into APCs (#57910)

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

* Adds sticking metallic kitchenware into APCs

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-25 03:49:36 +00:00
Gandalf
e1456b0cf6 Massive announcer/BSA overhaul (#4254)
* oh yeehaw

* Update default_announcer.dm

* a

* Update sound.dm

* Delete poweroff.ogg

* pref+newshit!

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* a

* Update set_security_level.dm

* a

* a

* a

* Update default_announcer.dm

* a

* a

* Update priority_announce.dm

* a

* Update priority_announce.dm

* ERT NOW HAS AN ALERT OPTION

* more changes to sounds! ALERTS

* Update set_security_level.dm

* THSI IS THE WAYSDFSASA

* you think you've seen shitcode? just you wait cowboy.

* a

* Update set_security_level.dm

* Update default_announcer.dm

* Update set_security_level.dm

* Update set_security_level.dm

* Update gravitygenerator.dm

* BSA AND FIXES!

* a

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* aaaaaaaaaaaaaa

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* a

* autodocker

* Update modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-23 00:16:26 +00:00
Gandalf
8727fe2b66 Update lighting.dm (#4326) 2021-03-22 17:12:40 +00:00
SkyratBot
9ffdf58259 [MIRROR] Some explosions code cleanup (#4276)
* Some explosions code cleanup (#57493)

Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf

* Some explosions code cleanup

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-21 01:03:36 +00:00
SkyratBot
c2d6dd7d75 [MIRROR] Fixes a ton of harddels (#4215)
* Fixes a ton of harddels (#57736)

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

* Fixes a ton of harddels

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2021-03-17 20:42:47 +00:00
SkyratBot
29680a2f0b [MIRROR] Fixes ethereals being unable to channel power into APCs, readds some defines (#4034)
* Fixes ethereals being unable to channel power into APCs, readds some defines (#57417)

* Fixes ethereals being unable to channel power into APCs, readds some defines

Co-authored-by: wesoda25 <37246588+wesoda25@users.noreply.github.com>
2021-03-10 02:31:08 +01:00
SkyratBot
59c317a276 Metastation Telecomms Powergrid Fix (#4005)
Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
2021-03-09 18:11:01 +00:00
SkyratBot
1df99c291c [MIRROR] Draws the singularity and some other things above the lighting plane (#4022)
* Draws the singularity and other large objects that create their own light or break/effect turfs above the lighting plane, to prevent shitty appearences when the lighting subsystem lags behind (#57512)

* Draws the singularity and some other things above the lighting plane

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-03-09 17:32:05 +00:00
SkyratBot
22b157a9a0 [MIRROR] Remove narnar sleeps (#3827)
* Remove narnar sleeps

* Update narsie.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-04 16:59:54 +00:00
SkyratBot
d63ad1a2c3 [MIRROR] Fix borgos infinite cable restrain (#3811)
* Fix borgos infinite cable restrain (#57346)

fix #56330

* Fix borgos infinite cable restrain

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-03-03 18:36:59 +00:00
SkyratBot
37ce893873 [MIRROR] SM monitor shows total moles & SM gets it's own defines file. (#3762)
* tgui: Total Moles in SM Monitor, Own Defines File (#57270)

Ever wondered why you failed to setup the scrungularity?

Well, wonder no more! The NT CIMS tab has been made to show total moles. The pressure got kicked however, since it's practically useless. The bar also turns red if your SM is eligible for scrung.

Moved the supermatter defines into it's own files too.

* SM monitor shows total moles & SM gets it's own defines file.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-03-02 19:11:52 +00:00
SkyratBot
90bac01c12 [MIRROR] Replaces old array sprites (#3736)
* Replaces old array sprites

* Update collector.dm

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-01 18:12:37 +00:00
SkyratBot
f5083f498b [MIRROR] *smacks table* Hot Damn! (#3734)
* *smacks table* Hot Damn! (#57269)

* *smacks table* Hot Damn!

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-01 17:49:38 +00:00
SkyratBot
640cc9744c [MIRROR] [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#3697)
* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#56889)

* crystallizer

* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-02-27 18:55:16 +00:00
SkyratBot
4e9561b168 [MIRROR] Do not lick the supermatter, it is not made of candy. (#3677)
* Do not lick the supermatter, it is not made of candy. (#57134)

    Adds a special interaction for people attempting to lick the supermatter.

* Do not lick the supermatter, it is not made of candy.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-26 14:20:17 +00:00
SkyratBot
cf9e01964c [MIRROR] Supermatter Can Display EER to Ghosts. (#3667)
* Supermatter Can Display EER to Ghosts. (#56991)

I'm not sure that there's a way for ghosts to check out the EER of the spicy rock without someone logging in on the console. This lets ghosts know if an SM is going to spawn tesla/skeleton in advance.

The part at the trait section (thanks to mothblocks) is changed to not cause runtimes when the supermatter is examined by ghosts.

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Supermatter Can Display EER to Ghosts.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-02-26 14:06:29 +00:00
SkyratBot
b7b03372fd [MIRROR] New supermatter sprites from Beestation (#3602)
* New supermatter sprites from Beestation (#56866)

Imageadd: Ports the supermatter sprite from Beestation

* New supermatter sprites from Beestation

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-23 13:11:39 +00:00
SkyratBot
e25ab8b975 [MIRROR] Miasma SM (#3528)
* Miasma SM (#54487)

Makes the supermatter crystal consume miasma in the air to power itself. The rate at which it consumes miasma scales with the partial pressure of the miasma and the gas mix of the surrounding air.

Miasma also increases gasmix_power_ratio, but by half as much as is normally standard

* Miasma SM

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-20 15:57:24 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
63de7b4b0d [MIRROR] Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#3415)
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#55551)

Converts the effects of the nightmares light eater into a component and a couple elements
Adds some flavor text to the light eater
Makes the effects of the nightmare's light eater dispel if the armblade is destroyed
Probably a net increase in code quality
More flavortext
The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade

* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-16 00:45:39 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
dc76c98db2 [MIRROR] Changes to Regal Rats (#3253)
* Changes to Regal Rats (#56145)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Paul, Sendroiu <AA2792@ student.jamk.fi>

* Changes to Regal Rats

Co-authored-by: eeSPee <robotdevilinside@gmail.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Paul, Sendroiu <AA2792@ student.jamk.fi>
2021-02-10 11:55:43 +00:00
SkyratBot
1c179f0512 [MIRROR] makes all emp_proof cells emp proof (#3148)
* Make all emp_proof cells emp proof (#56677)

For some reason only empty emp proof cells were emp proof. Now all emp proof cells are actually emp proof.

Co-authored-by: Sparkezel <1haslo4@ gmail.com>

* makes all emp_proof cells emp proof

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
2021-02-06 21:31:29 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
SkyratBot
b511bc53e6 [MIRROR] Makes emitters hitscan (#3047)
* Makes emitters hitscan (#56579)

* Makes emitters hitscan

* a

Co-authored-by: NotRanged <rangedvdk@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-03 22:37:40 +00:00
SkyratBot
70024ef6ad [MIRROR] Reverts Adds Neon Carpet (#55782) (#3040)
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)

It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis

* Reverts Adds Neon Carpet (#55782)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-03 10:22:43 +01:00
Gandalf
34d8917ebc Aesthetics fixes (#2986)
* fixes

* a
2021-01-31 16:40:05 +00:00
SkyratBot
902f0a06d7 [MIRROR] Adds Neon Carpet (#2882)
* Adds Neon Carpet

* HARDSET

* Update tgstation.dme

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 17:01:58 +00:00
SkyratBot
94f9a384b0 [MIRROR] [READY] Bespoke Datum Mats (#2737)
* [READY] Bespoke Datum Mats

* Update sheetifier.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-17 13:25:04 +01:00
SkyratBot
7361de863c [MIRROR] Refactor caltrop component into element (#2651)
* Refactor caltrop component into element

* Delete caltrop.dm

* Update caltrop.dm

Co-authored-by: coiax <jack@billbuddy.co.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-12 02:06:53 +01:00
SkyratBot
ce59be9350 [MIRROR] Move psychologist immunity from mind to skillchip (#2605)
* Move psychologist immunity from mind to skillchip (#55813)

Skillchips are neat, and this is the sort of "job-specific skill" that can remain job specific, but still gainable in the shift through in-universe means.

The logic behind the skillchip is that the supermatter is psychically sensitive, hence the hallucinations and headaches from looking at it and projecting the "correct mental aura" will help it calm down. But that is lore following mechanics.

Refactors skillchips to be able to automatically apply more than one trait.

* Move psychologist immunity from mind to skillchip

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-01-10 08:17:04 +01:00
SkyratBot
f79e91462c [MIRROR] LINDA Reforged (#2573)
* LINDA Reforged

* Update airlock.dm

* Update biohazard_blob_controller.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-08 18:52:35 +01:00
SkyratBot
b6eb1bdf3a [MIRROR] suppermatter doesn't get angry with mindless wights (#2530)
* suppermatter doesn't get angry with mindless wights (#55960)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* suppermatter doesn't get angry with mindless wights

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
2021-01-07 00:14:36 +01:00
SkyratBot
2d95ea6b2d [MIRROR] Makes a few changes to tesla movment (#2499)
* Makes telsas move properly, they were ping ponging around due to how miniballs move, I've made the shocked targets list properly fill, and make the shocked targets list retain some entries to preserve momentum (#55712)

* Makes a few changes to tesla movment

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-01-05 04:54:24 +01:00
SkyratBot
3a1cb5c976 [MIRROR] You can now mount things from the side (#2433)
* You can now mount things from the side (#55741)

* You can now mount things from the side

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-01-01 22:18:07 +01:00
SkyratBot
635d2d5aa1 [MIRROR] Fixes borg tiles (#2431)
* Fixes borg tiles (#55858)

- Fixes greyscale material floor tiles created from cyborg stacks
- Makes cyborg stacks contain materials
- Prevents a potential bug involving metalgen and stacks

* Fixes borg tiles

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-01-01 19:57:00 +00:00
NotRanged
9e42c4332a [Non-Modular] Rebalances previous SM anom PR (#2338)
* Tested, actually decent now

* Number

Co-authored-by: Ranged <nickvanderkroon@gmail.com>
2020-12-30 22:31:30 +00:00
SkyratBot
94ed7ed0f1 [MIRROR] Refactors how movetypes are added and removed, No timers this time. (#2358)
* Refactors how movetypes are added and removed, No timers this time. (#55444)

* Refactors how movetypes are added and removed, No timers this time.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-29 02:39:03 +00:00
SkyratBot
1c42a5cec3 [MIRROR] Fixes BRPED/rigged cell exploit and allows it to booby trap BRPEDs instead (#2357)
* Fixes BRPED/rigged cell exploit and allows it to booby trap BRPEDs instead (#55447)

BRPEDs can teleport rigged power cells. Through cameras. These rigged power cells will then pretty much immediately explode. This is a tad imbalanced.

Behaviour modified. Attempting to use a BRPED on a machine and having it attempt to swap over a rigged cell will cause the rigged cell to immediately go to maximum charge and explode.

Adds some logging to accompany it.
Why It's Good For The Game

Blowing things up from across the cosmos is bad.

Rigging BRPEDs to be able to explode when some poor sucker uses it to change over a power cell is cool.

* Fixes BRPED/rigged cell exploit and allows it to booby trap BRPEDs instead

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-12-29 02:38:55 +00:00
SkyratBot
0efb064972 [MIRROR] Deadchat plays everything - A simple way for admins to let deadchat control things. (#2337)
* Deadchat plays everything - A simple way for admins to let deadchat control things. (#55314)

* Deadchat plays things

* Pocket lint

* View those variables

* Arr var

* Arrr save changes and don't code while drunk

* Loog dot exe

* Big ol' changes

* Deadchat plays everything - A simple way for admins to let deadchat control things.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-12-26 23:47:28 +01:00
SkyratBot
a1f48f9200 [MIRROR] Makes the supermatter crystal immune to radiation (#2324)
* Makes the supermatter crystal immune to radiation. Not sure how I missed this (#55710)

* Makes the supermatter crystal immune to radiation

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-12-25 21:41:12 +00:00