Commit Graph

2406 Commits

Author SHA1 Message Date
SkyratBot
17e4f6ad76 [MIRROR] Converts SFX keys into DEFINES [MDB IGNORE] (#11990)
* Converts SFX keys into DEFINES

* fixes and updates

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
2022-03-11 16:43:39 -07:00
SkyratBot
93e22f6227 [MIRROR] reduce pluox produced by the SM [MDB IGNORE] (#12008)
* reduce pluox produced by the SM (#65120)

Decrease the pluoxium produced when exposing co2 to the SM by 5 times.
Decrease the co2 consumed by that process by half

CO2 setups were getting much harder to maintain due to the increased consumption of co2 and production of pluoxium at high level setups. This allows a more fine tuning of the gases and rebalances the gases production/consumption to be around the old levels (pre rads)

* reduce pluox produced by the SM

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2022-03-11 12:25:07 -05:00
SkyratBot
6f1ab2f231 [MIRROR] Ordnance Content Update: Scientific Papers [MDB IGNORE] (#11862)
* Ordnance Content Update: Scientific Papers

* Feex

* Updated our modular maps to not be missing equipment

* I also forgot to fix that in another PR, I'm too lazy to open a new one to fix it

* Yikes

* I forgot Journey

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-03-07 17:59:39 -05:00
SkyratBot
b540761c23 [MIRROR] New solar panel and tracker sprites [MDB IGNORE] (#11875)
* New solar panel and tracker sprites (#65167)

* New solar panel and tracker sprites

Co-authored-by: Tastyfish <crazychris32@gmail.com>
2022-03-04 11:03:29 -05:00
SkyratBot
fa15c6d5db Replacing power cells with RPED takes their charge into account (#11663)
Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2022-03-04 10:46:30 -05:00
SkyratBot
c287eb1e3c [MIRROR] Turns most alerts into defines [MDB IGNORE] (#11744)
* Turns most alerts into defines

* Update mobs.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-03-03 16:10:31 +00:00
SkyratBot
2402aabc3b [MIRROR] Resprites power cells, fixes and cleans up power cells and power cell derivatives [MDB IGNORE] (#11642)
* Resprites power cells, fixes and cleans up power cells and power cell derivatives

* part one

* part two

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2022-03-03 08:28:03 -05:00
SkyratBot
41bec3c9f2 [MIRROR] Changes rounding on cell power percentage [MDB IGNORE] (#11730)
* Changes rounding on cell power percentage (#65114)

* Changes rounding on cell power percentage

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2022-02-26 01:59:02 -05:00
SkyratBot
117eef784a [MIRROR] Fixes floor lights by setting their plane. [MDB IGNORE] (#11715)
* Set the plane for floor lights. (#65106)

Floor lights are missing "plane" and the default sets them to -4, which makes them appear on top of tables and players.

* Fixes floor lights by setting their plane.

Co-authored-by: Christmas5 <58363251+Christmas5@users.noreply.github.com>
2022-02-24 16:17:07 -05:00
SkyratBot
02d97ef416 [MIRROR] Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB [MDB IGNORE] (#11700)
* Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB  (#64939)

* Change hydroponics tray and chem dispenser AltClick behavior to be used by RMB

Co-authored-by: Tim <timothymtorres@gmail.com>
2022-02-24 06:50:41 -05:00
Nerevar
85fed784da [Semi-Modular] Synthetic Rebalance III: A Rope of Sand (#10821)
* upgradespeopleupgrades

* yeah

* weldingmoment

* Apply suggestions from code review

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

* love death and robots

* modularity i guess who knows

* Apply suggestions from code review

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

* wew

* literally just kill me

* satisfaction

* i hate synths

* Fixing the commented code

* Update code/modules/surgery/healing.dm

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

* whew

* Update modular_skyrat/master_files/code/modules/power/cable.dm

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

* Update modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm

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

* wew

* Update code/__DEFINES/~skyrat_defines/mobs.dm

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

* Should hopefully actually fix the logic for the synth revival surgery

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_defense.dm

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

* uwu

Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-02-16 16:51:40 +00:00
SkyratBot
4efcc7ac4b [MIRROR] Fixes some light presets being brighter than intended [MDB IGNORE] (#11527)
* Fixes some light presets being brighter than intended (#64861)

* fixes light presets

* into the void with you

* Fixes some light presets being brighter than intended

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
2022-02-15 23:33:27 +00:00
SkyratBot
88e86cf1a0 [MIRROR] Fixes issues found by new switch lints [MDB IGNORE] (#11454)
* Fixes issues found by new switch lints (#64766)

Very nice addition to sdmm.

* Fixes issues found by new switch lints

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-02-11 10:33:17 +00:00
SkyratBot
b2cc74a77e [MIRROR] Fixes layering issues brought by the FoV PR. [MDB IGNORE] (#11411)
* Fixes layering issues brought by the FoV PR.

* Update code/__DEFINES/layers.dm

* Update code/modules/mob/living/living_defines.dm

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-02-10 02:51:52 +00:00
SkyratBot
cd814c127f [MIRROR] Adds an option to generate typecaches as zebras. [MDB IGNORE] (#11330)
* Adds an option to generate typecaches as zebras.

* Update energy_ball.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-02-08 01:54:04 +00:00
SkyratBot
d682fbfbc8 [MIRROR] Rotation component refactor and improvements [MDB IGNORE] (#11304)
* Rotation component refactor and improvements

* Update code/modules/power/singularity/emitter.dm

* e

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-02-08 01:38:20 +00:00
SkyratBot
a7fcb65332 [MIRROR] Adds moveloop bucketing, uses queues for the singulo rather then sleeps [MDB IGNORE] (#11257)
* Adds moveloop bucketing, uses queues for the singulo rather then sleeps

* Update singularity.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-02-08 01:21:56 +00:00
SkyratBot
917f088914 [MIRROR] Improves ethereal APC sucking code [MDB IGNORE] (#11297)
* Improves ethereal APC sucking code (#64638)

* armhulen talk to me about the combat mode stuff

* cleans up the istype issues

* ryll please free me from slavery

* Improves ethereal APC sucking code

Co-authored-by: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com>
2022-02-06 14:02:56 +00:00
SkyratBot
204e8aaedc [MIRROR] Nerfs field gen repel stun [MDB IGNORE] (#11240)
* Nerfs field gen repel stun (#64611)

Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>

* Nerfs field gen repel stun

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
2022-02-03 09:54:45 +00:00
SkyratBot
1a6865a297 [MIRROR] fixed ethereals being unable to charge from APCs [MDB IGNORE] (#11251)
* fixed ethereals being unable to charge from APCs (#64547)

This PR allows ethereals to receive and give charge to APCs again. I had to make some design choices due to the fact there is no clear solution with ethereals having an action with two possible outcomes. I moved ethereal APC charging to its own function called from the right click attack hand function.

* fixed ethereals being unable to charge from APCs

Co-authored-by: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com>
2022-02-02 23:46:40 -05:00
SkyratBot
ab0dd1ddac [MIRROR] ethereals can now loop charging from lights [MDB IGNORE] (#11190)
* allows charging from lights to loop (#64548)

* ethereals can now loop charging from lights

Co-authored-by: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com>
2022-02-01 01:34:00 +00:00
SkyratBot
abf7e98baa [MIRROR] Removes useless defines for mutation paths [MDB IGNORE] (#11138)
* Removes useless defines for mutation paths (#64512)

* Removes useless defines for mutation paths

* Update cortical_borer_abilities.dm

* Update cqcplus.dm

* Update clown.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-30 15:56:08 +00:00
SkyratBot
cc7a3fe4e5 [MIRROR] Tweak CIMS to ignore Syndicate Owned crystal. [MDB IGNORE] (#11139)
* Tweak CIMS to ignore Syndicate Owned crystal. (#64526)

* Tweak CIMS to ignore Syndicate Owned crystal.

Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com>
2022-01-30 15:28:24 +00:00
SkyratBot
2cf3697537 [MIRROR] Fixes incorrect apc offset warnings [MDB IGNORE] (#11078)
* Fixes incorrect apc offset warnings (#64488)

We were setting the offset to negative values, then checking that against a non negative define

Uses the absolute value to compare instead of the signed value.

* Fixes incorrect apc offset warnings

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2022-01-28 16:38:33 -05:00
SkyratBot
6bf48b1f19 [MIRROR] Changes APC's/air alarm's lock/unlock hotkey from alt+click to right click [MDB IGNORE] (#10963)
* Changes APC's/air alarm's lock/unlock hotkey from alt+click to right click (#64352)

* APCs and air alarms lock/unlock with right click

* Changes APC's/air alarm's lock/unlock hotkey from alt+click to right click

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2022-01-24 13:37:59 -05:00
SkyratBot
af819aab4f [MIRROR] Kinesis Module [MDB IGNORE] (#10815)
* Kinesis Module

* Update security_officer.dm

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-01-20 03:45:22 +00:00
SkyratBot
1e4ba0273c [MIRROR] Fixes some mapping errors not using the mapping error log. [MDB IGNORE] (#10805)
* Fixes some mapping errors not using the mapping error log. (#64114)

Should help prevent #64066 from reoccurring.

* Fixes some mapping errors not using the mapping error log.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-01-19 17:21:17 +00:00
SkyratBot
5910fd9649 [MIRROR] MOD update: Modular Cores [MDB IGNORE] (#10710)
* MOD update: Modular Cores

* Fixing all dem conflicts

* Okay now it's going to compile too

* Fixing some Trigger() (they triggered me)

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-01-16 15:25:41 -05:00
SkyratBot
e0944dc9bd [MIRROR] Separates cult object and cult effect sprites into their own folders [MDB IGNORE] (#10672)
* Separates cult object and cult effect sprites into their own folders

* Let's do this

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-01-16 18:13:22 +00:00
SkyratBot
31edbba130 [MIRROR] In Soviet Nanotransen, Tram consume you! [MDB IGNORE] (#10726)
* In Soviet Nanotransen, Tram consume you! (#63643)

* stops the tram from consuming the SM

* In Soviet Nanotransen, Tram consume you!

Co-authored-by: DragonTrance <dylan661993@gmail.com>
2022-01-15 21:46:37 +00:00
SkyratBot
06990c0730 [MIRROR] Pluoxium production via supermatter CO2 O2 reaction will no longer consume oxygen that doesn't exist. [MDB IGNORE] (#10647)
* Pluoxium production via supermatter CO2 O2 reaction will no longer consume oxygen that doesn't exist. (#64014)

You can no longer produce oxygen free pluoxium. Adds a min check to prevent creating a significant amount of pluoxium while consuming an insignificant amount of oxygen.

Pluoxium needs oxygen.

* Pluoxium production via supermatter CO2 O2 reaction will no longer consume oxygen that doesn't exist.

Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com>
2022-01-13 04:30:26 +00:00
SkyratBot
65b8082678 [MIRROR] Harddel Fix Pack #42 + Better Live Reftracking Support [MDB IGNORE] (#10639)
* Harddel Fix Pack #42 + Better Live Reftracking Support

* awooga

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-01-12 21:57:49 +00:00
SkyratBot
11295edea0 [MIRROR] Blowing kisses at the supermatter crystal will now power it. [MDB IGNORE] (#10565)
* Blowing kisses at the supermatter crystal will now power it. (#63858)

* Pipe direction fix. (#1)

* Test

* Test

* Forgot to do this thing.

* Okay

* Why did I do that?

* Arghh

* Not sure how that got here.

* Revert "Pipe direction fix. (#1)" (#2)

This reverts commit 7ffd5b598f9bd598f67f6ba3219079f3c03e2ac4.

* Smart pipes direction fix.

Hi

* Revert "Pipe direction fix. (#1)" (#4)

* Gaming

* Flushed

* Okay

* Changes a number.

Co-authored-by: 170141183460469231731687303715884105727 <58013024+170141183460469231731687303715884105727@ users.noreply.github.com>

* Blowing kisses at the supermatter crystal will now power it.

Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com>
Co-authored-by: 170141183460469231731687303715884105727 <58013024+170141183460469231731687303715884105727@ users.noreply.github.com>
2022-01-10 17:50:33 +00:00
SkyratBot
63bf67f43c [MIRROR] Fixes a supermatter runtime. Also fixes an airlock runtime. [MDB IGNORE] (#10524)
* Fix supermatter and door runtimes (#63718)

About The Pull Request

It turns out that when the supermatter is about to explode it spams a div/0 runtime instead of emitting rads. This fixes that.
This also fixes a runtime caused by attempting to walk through an airlock with a cut ID wire since it came up in testing.
Why It's Good For The Game

Less runtimes.
Changelog

cl
fix: The supermatter will once again emit radiation when it is about to explode.
/cl

* Fixes a supermatter runtime. Also fixes an airlock runtime.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2022-01-08 02:48:43 +00:00
SkyratBot
c657faf095 [MIRROR] Fixes aiming at things through cameras not aiming at the thing you aimed at. [MDB IGNORE] (#10454)
* Fixes aiming at things through cameras not aiming at the thing you aimed at. (#63654)

You can click on things through cameras. This is one of the major appeals of BRPEDs. If you try to shoot at things while using a camera console to aim you will shoot at the angle between the camera you are looking through and the thing you are aiming at. This makes you aim at the thing you are aiming at from the perspective of yourself instead of the camera you are using.

While it would be funny to watch a sniper gun down their own team aiming through a camera bug and shooting in the opposite direction they think they I'd prefer if it actually worked.

* Fixes aiming at things through cameras not aiming at the thing you aimed at.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2022-01-06 12:35:16 +00:00
SkyratBot
39b9e3aefc [MIRROR] Fix Turf Transparency for MultiZ [MDB IGNORE] (#10349)
* Fix Turf Transparency for MultiZ

* Fixing some conflicts

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-01-03 20:38:30 +00:00
SkyratBot
58f82b5161 [MIRROR] [Ready] MODsuits [MDB IGNORE] (#10244)
* [Ready] MODsuits

* we dont need to add these people as codeowners, goodness gracious

* have to remove this because upstream

* part 1 of these fixes

* EEEE

* Update peacekeeper_clothing.dm

* E

* E

* Auto stash before merge of "upstream-merge-59109" and "origin/upstream-merge-59109"

* E

* Update expeditionary_trooper.dm

* more removal

* nice

* modsuti modstui modusuti

* fixes

* E

* ITS MODsuit not HARDSUIT

* more hardsuit references

* MODSUIT NOT HARSUITEDSA

* Maps

* More ,map

* oop

* e

* oo aa

* 0

* ting tang

* Update modsuit_tailsprites.dm

* hi fikou

* bs tech update

Co-authored-by: Fikou <23585223+Fikou@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: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-25 13:32:49 +00:00
SkyratBot
645b90d34a proximity monitors cleanup (plus connect_range and connect_containers components) (#10192)
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-12-23 03:51:23 +00:00
SkyratBot
119356e97f [MIRROR] Fixes Massive Radio Overtime, Implements a Spatial Grid System for Faster Searching Over Areas [MDB IGNORE] (#10107)
* Fixes Massive Radio Overtime, Implements a Spatial Grid System for Faster Searching Over Areas

* no spamming pings for upstream :(

* E

* E

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-12-23 03:06:56 +00:00
SkyratBot
ec963fc5fa [MIRROR] Remove old crappy singularity comment [MDB IGNORE] (#10197)
* Remove old crappy singularity comment (#63479)

* Remove old crappy singularity comment

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-12-22 14:24:04 +00:00
SkyratBot
25559a6c26 [MIRROR] Allows supermatter crystal to produce gases on non-space turfs that don't have air. [MDB IGNORE] (#10191)
* Allows supermatter crystal to produce gases on non-space turfs that don't have air. (#63276)

If there is no air on a turf, the supermatter crystal will not produce gases even if powered. This changes that so that it can produce gases while powered if there are none on the turf. It will still take damage in case it doesn't produce gases, or it gets immediately removed.

Although it's unlikely to happen, it will look very weird if the supermatter doesn't produce gas while on a non-space turf while powered, as that situation but with like 0.0001 moles on the turf would cause the SM to immediately go on fire.

* Allows supermatter crystal to produce gases on non-space turfs that don't have air.

Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com>
2021-12-22 13:37:55 +00:00
SkyratBot
463c2fc71d [MIRROR] multiz movement refactor redux [MDB IGNORE] (#9925)
* multiz movement refactor redux (#62132)

* multiz movement refactor redux

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-12-07 08:27:12 -05:00
SkyratBot
f037e05933 [MIRROR] APC being burnt now no longer spams runtimes. [MDB IGNORE] (#9876)
* APC being burnt now no longer spams runtimes. (#63244)

* APC being burnt now no longer spams runtimes.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-12-05 00:42:54 -05:00
Gandalf
f3020a7f42 Microfusion Energy Guns (#9638)
* RELOADING!

* Update skillchip.dm

* a

* Update master.dm

* Update master.dm

* Part one

* E

* E

* EOR

* Oops

* EEEH

* Fixes.

* begone oldcode from old times

* fixes

* cell attatchments

* haha u cant spell

* Gun attachments!

* Fastest gun in the west

* Update multi_cell_charger.dm

* ESA

* Stability

* phase emitters

* foixes

* More fixes

* Update microfusion_gun_attachments.dm

* Update microfusion_gun_attachments.dm

* eee

* Intermediate interactions.

* Update microfusion_energy_master.dm

* wooh

* EEE

* Update microfusion_cell.dm

* Map edits

* Merge branch 'master' into gun_reloads

* E

* attachment removal

* Update _basemap.dm

* proper parent gun interactions

* Update code/game/machinery/recharger.dm

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

* E

* Update modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm

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

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* Review comments pt2

* review comments pt2

* review part 3

* review part 4

* review 4.1

* review fixes

* Update microfusion_designs.dm

* ffs

* Update code/__DEFINES/~skyrat_defines/traits.dm

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

* Nearly there

* final review commit

* Update multi_cell_charger.dm

* Update microfusion_energy_master.dm

* E

* insight

* Fixes, rgb, remove instability on cells

* de epic

* Update _basemap.dm

* TGUI in the houise

* Update MicrofusionGunControl.js

* FULL STEAM AHEAD CHOO CHOO (Adds zooming)

* FUU bayonets and flights

* e

* Nearly

* microCHANGES

* Update gun.dm

* Minidate.

- Shooting the gun while it's overheating can cause it to [REDACTED].
- Shooting the gun while it's overheating will burn your hand!
- Some cells will now notify you when they're empty using an alarm sound.
- Gun barrel attachments now change the sound of the laser!
- An overheating emitter slows down!
- Emitters now control fire time more!

* 0

* owo

* FFF

* Update code/game/machinery/recharger.dm

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

* Update modular_skyrat/modules/gunhud/code/gun_hud_component.dm

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

* no spolsion

* Generally we want the cell in our hands

* 0

* Update microfusion_gun_attachments.dm

* E

* E

* FINAL

* superheater

* Update projectiles.dm

* Update microfusion_energy_master.dm

* Update projectiles.dm

* Update microfusion_gun40x32.dmi

* Update laser_1.ogg

* E

* whoop

* Cargo crates!

* Review plus material updates

* Update microfusion_designs.dm

* E

* E

* E

* E

* EEEE

* Update gun_spawns.dm

* Some fine tuining

* Update gun_spawns.dm

* Update recharger.dm

* E

* Update microfusion_gun_attachments.dm

* E

* E

* Update microfusion_gun_attachments.dmi

* Update code/game/machinery/recharger.dm

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

* E

* You can now actually insert different cells into advanced guns!

* 0

* E

* Update microfusion_gun_attachments.dm

* Update microfusion_energy_master.dm

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

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

* E

* Update microfusion_energy_master.dm

* Update microfusion_gun_attachments.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-12-03 22:38:08 +00:00
SkyratBot
3b0bab535a [MIRROR] CO2+O2 to Pluox conversion for the Supermatter again. [MDB IGNORE] (#9814)
* CO2+O2 to Pluox conversion for the Supermatter again. (#62626)

About The Pull Request

Now that radiation waves are gone, the SM isn't capable of generating Pluox, actually the only way to generate Pluoxium is with a reaction mix of O2/Plasma/Tritium at low pressure, something that I assume most of the Atmos players don't even know about as the SM was the main and efficient way to generate Pluox.

The change also removed Pluox as an annoying waste gas on the SM, not the biggest of nerfs but...

So I copied the way the SM reacts with Miasma to generate extra power (bet most people don't know about this either.) for parity on how the SM only reactions work, but with a few changes to work better with a high power charged CO2 SM compared to a Miasma one.

The main change compared to the Miasma reaction is that it scales less with power and more with pressure, a High pressure and low power CO2+O2 SM should be the most efficient/safe way to make Pluox, a different kind of challenge to the low pressure high power CO2 SMs we have already.

Also, the amount of Pluox generated might need tweaks, but it is nothing compared to the production of old Radiation charged SMs.
Why It's Good For The Game

When I was a lil baby Atmos Tech, I looked at the Pluox generation reaction and had such high expectations.

"Wow, I can make more efficient Pluox internals to give away, I can flood the Station with Pluox instead of O2 and it will prevent fires and allow Plasmamen to vibe!"

Such cute thoughts that never really got into reality because the task is gargantuan without much return... still cute thoughts that I hope new Atmos players at least try.

Something something S O U L.
Changelog

cl Guillaume Prata
expansion: After a short break, the Supermatter is back again at the her hard working and slightly different Pluoxium generation business.
/cl

* CO2+O2 to Pluox conversion for the Supermatter again.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-12-01 22:21:00 +00:00
SkyratBot
9b9b7ef70b [MIRROR] fixes borgs getting radiation burn message and rewrites some SM dust messages [MDB IGNORE] (#9695)
* fixes borgs getting radiation burn message and rewrites some SM dust messages (#63015)

* Bastardblaster

* Update code/modules/power/supermatter/supermatter.dm

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

* bigchungus

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

* fixes borgs getting radiation burn message and rewrites some SM dust messages

Co-authored-by: redsunover <76170211+redsunoverparadise@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
2021-11-25 06:36:13 +00:00
SkyratBot
c1ca55382d [MIRROR] Fixes ghosts' boo ability going on cooldown when the light they tried to flicker didn't flick [MDB IGNORE] (#9672)
* Fixes ghosts' boo ability going on cooldown when the light they tried to flicker didn't flick

* Update code/modules/power/lighting/light.dm

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-23 21:35:02 -05:00
SkyratBot
5aeef22b2f [MIRROR] Merge MACHINE/port_gen/Initialize definitions [MDB IGNORE] (#9429)
* Merge MACHINE/port_gen/Initialize definitions (#62747)

This apparently happened in 58d0f12c5c, four year ago, where a New()
was renamed to Initialize().

Apparently in this case, the second definition runs first, and the first
definition runs in the second's parent call. Since the second immediately
calls the first as a parent call, just merging them with the first's body
first preserves behavior.

This is slightly horrifying.

* Merge MACHINE/port_gen/Initialize definitions

Co-authored-by: esainane <esainane+github@gmail.com>
2021-11-13 09:02:30 -05:00
SkyratBot
3ecaa1cca1 [MIRROR] Fix spelling on multilayer cable reset [MDB IGNORE] (#9401)
* Fix spelling on multilayer cable reset (#62721)

* Fix spelling on multilayer cable reset

Co-authored-by: esainane <esainane+github@gmail.com>
2021-11-11 21:50:14 -05:00
SkyratBot
71b5f92eda [MIRROR] [MDB IGNORE] dir sanity, primarily on WALLITEMs [MDB IGNORE] (#9315)
* [MDB IGNORE] dir sanity, primarily on WALLITEMs (#62601)

About The Pull Request

Wall items mostly use the direction from the floor to the wall in the named mapping helper. Wall items mostly use the direction from the wall to the floor for the internal dir variable.

This leads to a headache when it comes to working out what conflicts with what, and what needs placing where.

Wall frames provided a member, inverse, which specified whether or not to invert the direction of the item when looking for conflicts. It was also used to specify whether to look for conflicts outside of the wall (cameras and lights appear external to the wall) or inside the wall (most wall items). This flag was set for Intercoms, APCs, and Lights. Since APCs and Lights expect a floor-to-wall direction, and Intercoms expect a wall-to-floor direction, this means that APCs and Lights were getting the correct direction, and Intercoms were getting the wrong direction.

Some implications of this setup were:

    You could build an APC on top of another wall item, provided there was nothing external attached to the wall and the area didn't have an APC.
    You could stack Intercoms indefinitely on top of the same wall, provided you weren't in a one-tile wide corridor with something on the opposite wall.

Or both! Here's twenty Intercoms placed on the wall, and a freshly placed APC frame after placing all Intercoms and deconstructing the old APC:

endless-stack-of-intercoms

Not everything used this inverse variable to adjust to the correct direction. For example, /obj/machinery/defibrillator_mount just used a negative pixel_offset to be visually placed in the correct direction, even though the internal direction was wrong, and never set! This also let you stack an indefinite number of defib mounts on the same wall, provided it wasn't a northern wall... except you could do this to northern walls too, since defibs weren't considered a wall item for the purposes of checking collisions at all!

Ultimately, every constructable interior wall item either used this inverse variable to adjust to the correct placement, set a negative pixel_offset variable to have its offset adjusted to the correct placement, or overrode New or Initialize to run its own checks and assignment to pixel_x and pixel_y!
Inventory: Table of various paths, related paths, and the adjustments they used

Unfortunately, untangling /obj/structure/sign is going to be another major headache, and this has already exploded in scope enough already, so we can't get rid of the get_turf_pixel call just yet. This also doesn't fix problems with the special 2x1 /obj/structure/sign/barsign.

Some non-wall items have been made to use the new MAPPING_DIRECTIONAL_HELPERS as part of the directional cleanup.

tl;dr: All wall mounted items and some directional objects now use the same direction that they were labelled as. More consistent directional types everywhere.
Why It's Good For The Game

fml
Changelog

cl
refactor: Wall mounted and directional objects have undergone major internal simplification. Please report anything unusual!
fix: You can no longer stack an indefinite amount of Intercoms on the same wall.
fix: Defibrillator Mounts, Bluespace Gas Vendors, Turret Controlers, and Ticket Machines are now considered wall items.
fix: Wall mounted items on top of the wall now consistently check against other items on top of the wall, and items coming out of the wall now consistently check against other items coming out of the wall.
fix: The various directional pixel offsets within an APC, Fire Extinguisher Cabinet, Intercom, or Newscaster have been made consistent with each other.
fix: The pixel offsets of Intercoms, Fire Alarms, Fire Extinguisher Cabinets, Flashers, and Newscasters have been made consistent between roundstart and constructed instances.
fix: Constructed Turret Controls will no longer oddly overhang the wall they were placed on.
qol: Defibrillator mounts now better indicate which side of the wall they are on.
fix: Some instances where there were multiple identical lights on the same tile have been fixed to only have one.
/cl

* [MDB IGNORE] dir sanity, primarily on WALLITEMs

* apc directionals

* bluespace vendor fix

* defib fix

Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-11-10 17:17:26 -05:00