Commit Graph

9902 Commits

Author SHA1 Message Date
SkyratBot
25bfeea096 [MIRROR] Move scan results from health analyzers/other scanners from local chat to info tab [MDB IGNORE] (#9883)
* Move scan results from health analyzers/other scanners from local chat to info tab

* Fix that shit up

* More fixies

* There we go

Co-authored-by: maxspells <94013721+maxspells@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-12-05 15:38:49 +00:00
SkyratBot
9ce1a9b733 [MIRROR] Wethide now dries into leather after burning [MDB IGNORE] (#9868)
* Wethide now dries into leather after burning and grilling (#63198)

You can now dry wet hide (obtainable by skinning and wetting goliath plates or other animal hides) into leather by lighting it on fire (with a bonfire grill especially, though the heat of being on fire will dry it regardless of the origin of the fire)

This also means that ashwalkers will be able to obtain leather without getting power, since drying racks require power, which, as shown in #63195, is apparenly intended and not a bug.

* Wethide now dries into leather after burning

Co-authored-by: Bond <58570888+TheBonded@users.noreply.github.com>
2021-12-04 02:13:48 +00: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
959f66bf47 [MIRROR] Fixed spelling of possession, Separate, and Cemetery [MDB IGNORE] (#9862)
* Fixed spelling of possession, separate, and cemetery (#63203)

Just fixes some spelling for gangs. I also fixed misspellings for "posession" to "possession". Fixed "seperate " to "Separate" Fixed "Cemetary" to "Cemetery"

* Fixed spelling of possession, Separate, and Cemetery

Co-authored-by: Doctor Pope <84367152+Dr-Pope@users.noreply.github.com>
2021-12-03 16:58:40 -05:00
SkyratBot
e55fb78f94 [MIRROR] Added an examine message to wired glass tiles [MDB IGNORE] (#9861)
* Added an examine message to wired glass tiles (#63175)

I thought that not being able to place those tiles were a bug. Seems like it's a feature.

* Added an examine message to wired glass tiles

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-12-03 16:56:26 -05:00
SkyratBot
eb25658e2f [MIRROR] adds the ability to splat the goat [MDB IGNORE] (#9860)
* the goat plushie can be run over (#63148)

You can now run over the plushie with the tram, splatting it into the ground

Non-joke reason: The tram now sends a signal to the destination turf, which can be used by objects to have unique interactions with the tram when being ran over.

* adds the ability to splat the goat

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
2021-12-03 16:56:06 -05:00
Tom
477217bc34 Fixes FTU 'Ignis' plasma sword (#9840) 2021-12-03 15:49:19 -05:00
SkyratBot
2174618823 [MIRROR] TGUI pAI Hotfix 1 [MDB IGNORE] (#9855)
* TGUI pAI Hotfix 1 (#63160)

Adds a new ui state so that players can access the paicard tgui while it's slotted in their PDA (inside the pda wasn't technically in the user's close inventory).
Adds some documentation for the pAI candidate file
Users now get notifications if they can't save files (guest keys).
pAIs previously had NO on screen indicator of hack progress, so I've given them a progressbar over the door
More visual output for pAIs
More output for edge cases
More documentation
Fixes #63161

* TGUI pAI Hotfix 1

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
2021-12-03 15:47:45 -05:00
SkyratBot
3c9610c63d [MIRROR] Fixes forged agent id cards breaking wallets [MDB IGNORE] (#9854)
* Fixes forged agent id cards breaking wallets (#63069)

Forged agent ids no longer prevent access from being combines from cards in a wallet

* Fixes forged agent id cards breaking wallets

Co-authored-by: HarseTheef <74737391+HarseTheef@users.noreply.github.com>
2021-12-03 15:14:58 -05:00
SkyratBot
a7f92e5e3f [MIRROR] Gives blind people a chat message when someone tries to handcuff them [MDB IGNORE] (#9834)
* Gives blind people a chat message when someone tries to handcuff them (#63192)

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

* Gives blind people a chat message when someone tries to handcuff them

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
2021-12-02 22:23:52 +00:00
SkyratBot
67e89df03c [MIRROR] Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide [MDB IGNORE] (#9832)
* Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide (#63130)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* Updates /code/game/objects/item/{melee,tcg}/* to follow the style guide

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-12-02 22:23:31 +00:00
SkyratBot
35a98b019b [MIRROR] Catwalk Tiles have names now & can be recycled [MDB IGNORE] (#9799)
* Catwalk Tiles have names now & can be recycled  (#63142)

* Catwalk Tiles have names now & can be recycled

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
2021-12-01 10:21:38 -05:00
SkyratBot
310c932c4f [MIRROR] Fixes PDA skill tracker hard lock [MDB IGNORE] (#9787)
* Fixes PDA skill tracker hard lock (#63024)

* Fixes PDA skill tracker hard lock

Co-authored-by: Tastyfish <crazychris32@gmail.com>
2021-11-30 15:57:28 -05:00
SkyratBot
43cb9a554b [MIRROR] pAI TGUI conversion [MDB IGNORE] (#9784)
* pAI TGUI conversion

* Feeeeeeex

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-30 01:18:16 -05:00
SkyratBot
0a7da7a901 [MIRROR] Fixes baseball bat knockback relative direction [MDB IGNORE] (#9781)
* Fixes baseball bat knockback direction (#63089)

Baseball bats now establish their direction of knockback based on the cardinal direction from the atom of the bat to the target instead of the user to the target.

* Fixes baseball bat knockback relative direction

Co-authored-by: HarseTheef <74737391+HarseTheef@users.noreply.github.com>
2021-11-30 04:06:51 +00:00
SkyratBot
f507febe4d [MIRROR] Fixes yet another couple TK teleportation tricks. [MDB IGNORE] (#9752)
* Fixes yet another couple TK teleportation tricks. (#62925)

Fixes airlock notes and cloth sheets cut from gauzes being teleported to the user because of TK.

* Fixes yet another couple TK teleportation tricks.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-28 14:12:26 -05:00
SkyratBot
5509d3b47c [MIRROR] Bot code improvement (2/??) [MDB IGNORE] (#9717)
* Bot code improvement (2/??)

* Feex

* More feex

* Now we're good... Right?

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-28 01:55:51 +00:00
SkyratBot
aefaa7e228 [MIRROR] Re-paths and changes the worn layer of GAR glasses [MDB IGNORE] (#9736)
* Re-paths and changes the layer of GAR glasses (#63009)

Re-paths GAR glasses to make them subtypes of each other, where applicable.
Re-names some of the icon states, to make it clearer as to what they are.

Changes the alternate_worn_layer to make them show over hair, rather than under. (Muh reference)

Subtypes good. Being able to see what you're wearing properly also good.

* Re-paths and changes the worn layer of GAR glasses

* Feex

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-28 01:10:36 +00:00
SkyratBot
6e13367e78 [MIRROR] Abductor Frankenstein edition: How aliens got a limb grower. [MDB IGNORE] (#9731)
* Abductor Frankenstein edition: How aliens got a limb grower. (#62841)

This PR will completely remove the brain traumas component of being abducted. in its place, there will be a round start limb grower machine to make up for it. All upgrade disks for the machine come in the above locker and I was even nice enough to include 50 units of synthflesh! Wow!

* Abductor Frankenstein edition: How aliens got a limb grower.

* Fixed Skyrat's abductor ships

Co-authored-by: carshalash <carshalash@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-27 17:10:31 -05:00
SkyratBot
aa89507910 [MIRROR] I forgot to add an achievement for getting pda bombed. [MDB IGNORE] (#9744)
* I forgot to add an achievement for getting pda bombed. (#62948)

Co-authored-by: Kylerace <kylerlumpkin1@ gmail.com>

* I forgot to add an achievement for getting pda bombed.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Kylerace <kylerlumpkin1@ gmail.com>
2021-11-27 20:33:09 +00:00
SkyratBot
de5ab5cfe7 [MIRROR] Updates /code/game/objects/item/grenades/* to follow the style guide [MDB IGNORE] (#9726)
* Updates /code/game/objects/item/grenades/* to follow the style guide (#63030)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* Updates /code/game/objects/item/grenades/* to follow the style guide

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-11-27 20:27:41 +00:00
SkyratBot
747a8273d8 [MIRROR] Gradients can now be applied to facial hair too. [MDB IGNORE] (#9719)
* Gradients can now be applied to facial hair too.

* Fixing dem conflicts

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-27 20:22:36 +00:00
SkyratBot
3887794863 [MIRROR] Updates /code/game/objects/item/circuitboards/* to follow the style guide [MDB IGNORE] (#9735)
* Updates /code/game/objects/item/circuitboards/* to follow the style guide (#63026)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* Updates /code/game/objects/item/circuitboards/* to follow the style guide

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-11-26 20:47:58 -05:00
SkyratBot
6ecfa7ace3 [MIRROR] prison plates now include their name in a lot of places it was missing [MDB IGNORE] (#9729)
* prison plates now include their name in a lot of places it was missing (#63068)

* prison plates now include their name in a lot of places it was missing

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-26 20:44:16 +00:00
SkyratBot
bf1a2409c5 [MIRROR] Catwalk Tiles REVAMP + floorbot buff [MDB IGNORE] (#9724)
* Catwalk Tiles REVAMP + floorbot buff (#63016)

Requested to bring this upstream, so here we are now. The floorbot stuff is new though.

Adds new catwalk tiles that blend better with other flooring

Also does some improvements to floorbots, specifically:
-Auto-place catwalks in maints (now when they wander in there they'll actually be helpful!)
-Actually patch holes (they used to just lay a tile over space and call it good; crowbarring it up would show a lack of plating)
-Repairing floor tiles actually REPAIRS it, leaving the decals intact

More usable catwalks, rather than what we currently had.

Added new reskins of the Catwalk Tiles, which will blend better with other types of floor! These can be selected via a radial on the base catwalk tile, crafted with iron rods.
Floorbots will automatically place catwalks when they're in a maintenance area, and will repair damaged/burnt tiles rather than fully replacing them.
Floorbots will actually place a plating when repairing a breach with tiles, rather than haphazardly laying a tile that has space below it.

* Catwalk Tiles REVAMP + floorbot buff

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
2021-11-26 07:11:59 -05:00
SkyratBot
e99b87ad42 [MIRROR] Toy Crossbows can be fired with one hand again [MDB IGNORE] (#9686)
* Toy Crossbows can be fired with one hand again (#63021)

* Toy Crossbows can be fired with one hand again

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-11-24 23:26:56 +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
a20f1d7492 [MIRROR] Department orders now include unique circuitboards [MDB IGNORE] (#9668)
* Department orders now include unique circuitboards (#62830)

About The Pull Request

I missed the circuitboards in the original pr, now they have em!
Why It's Good For The Game

Not really even printable right now but they are needed to reconstruct them in case of damage
Changelog

cl
fix: department order consoles include circuitboards
/cl

* Department orders now include unique circuitboards

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-23 21:05:23 -05:00
SkyratBot
40f7364842 [MIRROR] Refactor cult dagger rune drawing and null rod rune clearing into components + minor rune / blood magic tweaks [MDB IGNORE] (#9662)
* Refactor cult dagger rune drawing and null rod rune clearing into components + minor rune / blood magic tweaks (#62918)

The act of inscribing runes, anchoring / unanchoring cult structures, deconstructing cult girders, and purging cultists of holy water have all been moved off of the cult dagger itself and onto a component, cult_ritual_item.

The act of destroying a cult rune or heretic rune with the null rod have been moved off of their respective items and onto the nullrod itself.

Added a signal, COMSIG_ITEM_ATTACK_EFFECT, for the above purposes.
Various cult spells and dagger interactions have had their code improved slightly.

* Refactor cult dagger rune drawing and null rod rune clearing into components + minor rune / blood magic tweaks

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-11-23 12:45:12 -05:00
SkyratBot
d3692922ef [MIRROR] Donuts found in sec vendors and boxes can now be used to make glazed donuts [MDB IGNORE] (#9559)
* Donuts found in sec vendors and boxes can now be used to make glazed donuts (#62910)

* Donuts found in sec vendors and boxes can now be used to make glazed donuts

* Hopefully fixes CI

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 12:02:47 -05:00
SkyratBot
7352c16d46 [MIRROR] Lets you build & deconstruct glass floors [MDB IGNORE] (#9640)
* Lets you build & deconstruct glass floors (#62890)

* Lets you build & deconstruct glass floors

* Adds the glass tiles to our modular files

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-23 10:21:53 -05:00
SkyratBot
3154627354 [MIRROR] Yee-haw Update: Code Spaghetti Western Edition [MDB IGNORE] (#9603)
* Yee-haw Update: Code Spaghetti Western Edition

* Feex?

Co-authored-by: Farquaar <44147031+Farquaar@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-11-22 14:29:53 +00:00
SkyratBot
69a9694b3a [MIRROR] Bonfire can be made with wood [MDB IGNORE] (#9611)
* Bonfire can be made with wood (#62939)

Co-authored-by: Colovorat <lolqwert569@ gmail.com>

* Bonfire can be made with wood

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: Colovorat <lolqwert569@ gmail.com>
2021-11-22 09:19:18 -05:00
SkyratBot
8ca66e7bb2 [MIRROR] Stun Batong now turns off/on constantly for short time after emp [MDB IGNORE] (#9601)
* Stun Batong now turns off/on constantly for short time after emp (#62943)

About The Pull Request
title

Why It's Good For The Game
i dunno, seems funny it gives more depth or something allows for more intresting interactions

Changelog
🆑
expansion: Stun Batong now turns off/on constantly for short time after emp

* Stun Batong now turns off/on constantly for short time after emp

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
2021-11-21 19:11:34 -05:00
OrionTheFox
b4bfffa54e ranged analyzer hnngh (#9510) 2021-11-21 18:46:39 +00:00
SkyratBot
0ab81fe466 [MIRROR] Refactors Sign Language & Fixes Inconsistency [MDB IGNORE] (#9596)
* Refactors Sign Language & Fixes Inconsistency (#62836)

Refactors Sign Language code so instead of copy-pasting the same giant wall of checks we can just use a proc.
Also now checks to see if your limb is disabled, which fixes people with disabled robotic limbs being able to sign still.
Finally, the tongue only has ORGAN_UNREMOVABLE if you attained it from the trait. I've been told that the tongue could be attained from meateors and I think that's funny as hell so I swapped that over.

* Refactors Sign Language & Fixes Inconsistency

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
2021-11-21 18:33:00 +00:00
SkyratBot
532ce4e9ef [MIRROR] Proper custom job name support [MDB IGNORE] (#9547)
* Proper custom job name support

* merge (#9552)

Co-authored-by: Tastyfish <crazychris32@gmail.com>
2021-11-20 22:52:42 +01:00
SkyratBot
9c6890ecc1 [MIRROR] Exempts non-deadminned admins from all the chat filters so they can break the server rules and get banned if they want to. [MDB IGNORE] (#9582)
* Exempts non-deadminned admins from all the chat filters so they can break the server rules and get banned if they want to. (#62944)

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

* Exempts non-deadminned admins from all the chat filters so they can break the server rules and get banned if they want to.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-11-20 08:50:20 -05:00
SkyratBot
a94325afe4 [MIRROR] Replacing more C-style for loops with the faster, traditional ones. [MDB IGNORE] (#9560)
* Replacing more C-style for loops with the faster, traditional ones. (#62908)

* Replacing more C-style for loops with the faster, traditional ones.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-19 20:37:13 +00:00
Pinta
a4bc438356 [SEMI-MODULAR] Hypospray storage consistency tweaks. (#9511)
* belt

* belts
2021-11-18 18:48:37 -05:00
SkyratBot
cca62b656e [MIRROR] Pacifists can no longer attach c4 to other living creatures. [MDB IGNORE] (#9549)
* Pacifists can no longer attach c4 to other living creatures. (#62903)

* Pacifists can no longer attach c4 to other living creatures.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-18 18:40:37 -05:00
SkyratBot
f80134d6a4 [MIRROR] Fixes some issues with the PDA UI [MDB IGNORE] (#9526)
* Fixes some issues with the PDA UI (#62864)

* Fixes some issues with the PDA UI

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-17 22:26:17 +00:00
SkyratBot
7f6712e121 [MIRROR] Gets Rid Of An Errant Space From The Baton Knockdown Message [MDB IGNORE] (#9520)
* Gets Rid Of An Errant Space From The Baton Knockdown Message (#62865)

* Gets Rid Of An Errant Space From The Baton Knockdown Message

Co-authored-by: Jackraxxus <60418544+Jackraxxus@users.noreply.github.com>
2021-11-17 20:31:49 +00:00
SkyratBot
054b4d9739 [MIRROR] nitryl and stimulum merge in nitrium [MDB IGNORE] (#9514)
* nitryl and stimulum merge in nitrium (#62061)

This PR is the first of a few were i'll be merging similar working gases into one.
This time is Nitryl and Stimulum. They'll be merged into Nitrium , a brown gas with both features of the two gases
The main scope is to add dept to atmos by removing bloated content and/or repeated content that has never seen the lights of the day (how many times have you seen both gases made and used at the same time?)
The PR so far:
-removed nitryl
-removed stimulum
-merged them into Nitrium (Nitrium is now made with trit, nitrogen and bz from a minimum temperature of 1500 K)
-made Nitrium have both gases features such as fast movements and sleep and stun immunity but increased damage taken
-Nitrium can make crystals that spread the chemicals with a cloud (is still far more efficient to just breathe the gas)

Less rare gases, going towards a better atmos gameplay loop

* nitryl and stimulum merge in nitrium

* Fixing blackmesa

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-17 15:14:33 -05:00
Superlagg
1b427bdda1 [NON-MODULAR] Re-adds per-character PDA settings (#9453)
* Ringers work now
Added entry on the list
moved PDA colors and style to character prefs
Works as far as I can tell!

* Made requested changes
Description less overly specific and meta-referencey
Sanitized input
2021-11-16 16:34:53 -05:00
SkyratBot
aa350bb1af [MIRROR] Adds New Aquarium Fish! [MDB IGNORE] (#9498)
* Adds New Aquarium Fish! (#62840)

* fish

* fixes broken stuff

* no emulsijack betrayal, emuslijacks will now reproduce

* Adds New Aquarium Fish!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-16 16:31:53 -05:00
Gandalf
4a950241b6 [PRIORITY] MODULARISATION AUDIT PART 1: MAKING SKYRAT GREAT AGAIN (#9464)
* EFT

* E

* EEE

* E

* INTO TO ORBIT

* I hate this but I'm going to ignore it.

* Seriously, fuck this.

* Update CentCom_skyrat_z2.dmm

* Update tgstation.dme

* oops

* Update positronic_alert_console.dm

* E
2021-11-16 12:01:30 -05:00
SkyratBot
902f2ae0ef [MIRROR] Da carpskin tailoring expansion: New luxurious carpskin suit and fedora. [MDB IGNORE] (#9490)
* carpswag (#62811)

expansion: Carpskin suits and fedoras can now be crafted using carp scales.

* Da carpskin tailoring expansion: New luxurious carpskin suit and fedora.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-11-16 11:14:02 -05:00
SkyratBot
05d6feb6b4 [MIRROR] Allows plates on trays [MDB IGNORE] (#9487)
* Allows plates on trays (#62814)

* Allows plates on trays

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-11-16 08:32:02 -05:00
SkyratBot
a860769e8f [MIRROR] Fixes Atheism [MDB IGNORE] (#9481)
* The atheists fedora now makes you try to get further from god (#62821)

Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>

* Fixes Atheism

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Thunder12345 <stewart@ critar.demon.co.uk>
2021-11-15 20:03:25 -05:00