Commit Graph
56 Commits
Author SHA1 Message Date
pixelkitty286andGitHub 92ab041247 Research Cyborg and other borg module changes (#5118)
# About The Pull Request
This PR aims to put the some of the feature set I originally intended
research borgs to have and some quality of life things.

It also includes some small changes for some other modules mostly small
things such as removing names already being defined twice and it moves
some mining borg items into the proper mining borg tech web.

Also research borgs now have their own tech web instead of relying off
other techwebs.

### This PR adds these items to research borgs:

- robotics RCD with proper functionality to fix synths. (Upgrade item
only! Does not allow decon or construction!)


### This PR changes a few grippers:

- Research borg circuit gripper now allows full assembly use

- Research borg Illegal gripper now allows upgrades to be preformed on
other cyborgs (Only obtainable via emag or illegal upgrades!)

## Why It's Good For The Game
I made this PR to allow research cyborgs to have more expanded use for
what their intended purpose is which in my eyes is a support role
allowing them to build machines and gadgets that science builds wile
also preforming some basic tasks, and when malfunctioning becoming a
reliable back bone to the silicons or their subversive for repairs or
upgrades with some of these tasks taking longer than robotics preforming
such tasks.

Other cyborg changes were done to clean up and are some small quality of
life changes that I think I was suggested and research borgs get their
own tech web now because they should of had one in the first place but
for some reason I never made it one.

I've been holding off on this PR for a few months and in that time I've
been deciding if it would be worth to finish it or not and the more I
look and see how things are actually used and the state of research
borgs are in it makes me wonder if players who brought up some of the
original features, I intended this borg module to have, were complaining
out of bad faith or were worried bad faith players would exploit this,
and my response is if players are going to use these items intended for
the research department are used for bad faith as borg, what makes one
think they won't just as a non borg.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
Please note these images were taken few months ago during ice scream day

Card IDs have been removed also!

Normal stock
<img width="587" height="299" alt="dreamseeker_nWLUzOEgdY"
src="https://github.com/user-attachments/assets/6010fc2b-1d07-421a-a85b-5555b3889bbd"
/>

Normal upgraded
<img width="584" height="288" alt="dreamseeker_S4yChSmUFw"
src="https://github.com/user-attachments/assets/c4b0e5d1-92a5-4410-8a2b-1a505fbe833f"
/>

Hacked and upgraded
<img width="584" height="287" alt="dreamseeker_3UtWhSGNig"
src="https://github.com/user-attachments/assets/f3069a8b-48f3-43af-916f-2710d9fae89e"
/>

</details>

## Changelog
🆑
add: Research borg RCD
add: Assembly usage for research borgs
add: Allowing research borg Illegal gripper to apply borg upgrades
balance: Research borg
code: Removed some double name defines
code: Made mining borg items under the mining borg tech web
refactor: Research borg tech web into it's own tech web
/🆑
2026-01-22 01:11:58 +02:00
gavlaandGitHub 87db41dbd7 Adds the Surgical Processor to the Medical Protolathe after alien surgery is researched (#5023)
## About The Pull Request

After science researches the Alien Medical tech node, the handheld,
normal sized, Surgical Processor item can be printed at medical lathes.

## Why It's Good For The Game

The surgical processor is already included in the alien surgical arm
implant, so this seems fitting as an alternative way of getting it.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

<img width="699" height="556" alt="image"
src="https://github.com/user-attachments/assets/a0eb2f89-c17a-4b34-89db-2ac5cd5ccbda"
/>

</details>

## Changelog

🆑
add: Added the surgical processor to the medical lathe. It is unlocked
with the alien surgery tools research node.
/🆑
2025-12-17 23:50:54 -08:00
Sir WintersandGitHub b0ca137649 Janiborg Modifications (#4912)
## About The Pull Request

- Gives Janiborgs the Experimental Broom round-start.
- Comments out the wirebrush upgrade. (It's already there round-start
already?)
- Gives Janiborgs Cable, RLD, RTD, and Decal Painter upgrades.
## Why It's Good For The Game

Allows janiborgs to fix lights and maint-mice wires later in the round.
Upgrades them from their shitty-tiles to modern-tiles so they can
actually make the kitchen look classy after someone blows it up. Gives
them the ability to touch up areas with decals as well, because most
engineers are just gonna slap down the pipes/wires and call it a day.

## Proof Of Testing

<img width="461" height="398" alt="image"
src="https://github.com/user-attachments/assets/75ffe907-f4ec-4d81-aefa-f43d458f17a3"
/>

<img width="599" height="160" alt="image"
src="https://github.com/user-attachments/assets/d8307015-6980-4138-8556-bc8a72f1264c"
/>

<img width="563" height="203" alt="image"
src="https://github.com/user-attachments/assets/d5c0b210-3826-4f28-8555-1c19a57a9ee1"
/>

</details>

## Changelog
🆑
add: RLD, RTD, Decal Painter, and Cable upgrades for janiborgs.
del: wirebrush upgrade, because it's already roundstart.
qol: added brooms to janiborgs roundstart
/🆑
2025-11-26 04:35:05 +01:00
CursorandGitHub 5055fbe77d Ports colourable Umbrellas from Monkey, makes the rain hiding a trait (#4803)
## About The Pull Request
Title.
## Why It's Good For The Game
It's colourable, trait can be used for more. Shaded vamp funny.

- [x] Port basic stuff.

- [x] Weather stuff.
- [x] Vampire stuff.


## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑 Absolucy, Constellado, theselfish, Arturlang
add: Umbrellas are now gags colourable!
add: Umbrellas protect vampires from the sun.
/🆑
2025-10-16 16:06:41 -07:00
ee9048baee Civilian HUDs + Implant (#4219)
## About The Pull Request
Adds civilian HUDs and HUDsunglasses to the game. They can see the job
icon, but not mindshield/wanted/permit status. Juuuust the job icon.

Regular variant available in loadout and autodrobe, as well as sci and
service lathes after being researched with the rest of the huds.
Sunglasses available through crafting the same way you craft the others.

Also adds it as a researchable implant. Available in augments+ for 4
quirk points.


Also Alexios did the really pretty grey version of the sprite so they
get to be in the changelog :)
## Why It's Good For The Game
Bubberstation has a LOT of people running around with outfits not
correlating to their job. This makes it hard to find out what job people
are at a quick glance at times. This adds a HUD that lets you see the
job icon and nothing else.

I ran an adminbussed version of these and players pretty much
unanimously agreed that they were nice to have, and agreeing with my
above point of "it is hard to see what job people are at times"

Also they just look cool.
## Proof Of Testing

<img width="101" height="152" alt="image"
src="https://github.com/user-attachments/assets/67ce82aa-fd4e-45fa-a6eb-b78079541756"
/>
<img width="114" height="164" alt="image"
src="https://github.com/user-attachments/assets/e4a5f9c4-11ac-4136-bbff-f757e50bdb85"
/>
<img width="228" height="159" alt="image"
src="https://github.com/user-attachments/assets/7e15423a-7c85-4b19-bbc5-15286e6ab99d"
/>
<img width="162" height="190" alt="image"
src="https://github.com/user-attachments/assets/cd8181b4-c2ef-4ddc-ad20-fbc86c2f07eb"
/>
<img width="334" height="36" alt="image"
src="https://github.com/user-attachments/assets/ca658549-63b0-4d0b-917d-d5cf535828f3"
/>




## Changelog
:cl:Sapphoqueer, Alexios
add: Civilian HUDs and Civilian HUDSunglasses. Available in loadout,
clothesmate, and sci/servicelathes after the HUD research. These show
job icons and nothing else.
add: Civilian HUD implants. Printable by sci through the cybernetics
implants node, as well as being in augments+ for 4 quirk points.
/🆑

---------

Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
2025-07-15 21:17:19 +03:00
Roxy 663d2f9e6c design source part 2: the torture 2025-05-05 19:35:20 -04:00
Roxy d83a3313bb unfucking design source part 1 2025-05-05 18:11:57 -04:00
LT3andGitHub 6515a3c06e Self-Actualization Device is available without research (#3571)
## About The Pull Request

As per adding the SAD to be roundstart available as per admin request,
eliminates the research requirement to build new ones. Places a SAD on
the Bubberstation specific maps. Updates the logging to properly log
instead of spitting into the admin chat.

## Why It's Good For The Game

Now everyone is free to be SAD, anytime, anywhere.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog

🆑 LT3
balance: SAD is now available to be built roundstart
map: Added roundstart SAD to Bubberstation maps
/🆑
2025-04-19 21:34:12 -07:00
2543d88548 Punch Clock PDA Application/Modular Console (#2900)
## About The Pull Request
Adds a new NTOS application to the game: "Plexagon Punch Clock", which
functions similarly to the time clock in cryo.
Using the app, crew members can clock out wherever they want. This will
also create a locked briefcase containing certain job-related items;
this can be unlocked by the player once they return to the shift, or by
a relevant Command member.
For later changes I'd like to be able to have this app be able to clock
in/out a user via their DNA imprint.
## Why It's Good For The Game
- It's easier to clock out before going for RP/ERP when done with work.
- Placing job items in an easily-accessible box means that it's less
annoying to return to work after finishing RP/ERP
- Convenience
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

![GIF 12-Jan-25 6-22-47
PM](https://github.com/user-attachments/assets/2b90ccb6-a175-4e2a-80c2-bfe717f99358)
</details>

## Changelog
🆑 ArrisFairburne, LT3
add: Added a new app to clock in and out from any NT OS-compatible
device (Plexagon Punch Clock)
qol: Your job items are now locked into a box instead of warped to cryo,
when clocking out
/🆑

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
2025-02-11 01:03:45 -08:00
WaterpigandGitHub 674b7c9e2a Moved the expand and shrink modules to Augmentation, moved artistic module to the correct tab (#2966)
## About The Pull Request

See name, +generic upkeep

## Why It's Good For The Game

Borgs don't really have much going for them in the way of customization,
and the shrink and expand modules provide no additional bonuses. If
anything, they provide one of the very limited ways borg players can
express their character, so locking it behind a lategame research is a
bit stupid

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/d2e256d2-a116-4b34-a862-f3e5cc7d6baf)

![image](https://github.com/user-attachments/assets/d0455087-f184-489e-9686-f9a5eb74e9ab)


![image](https://github.com/user-attachments/assets/c09bb268-643a-4005-869a-b1267730c985)


</details>

## Changelog

🆑
balance: Shrink and Expand modules are now unlocked immediately
fix: The artistic module is now in the correct tab
spellcheck: fixed lowercase on the dominatrix module
/🆑
2025-01-31 12:50:38 -05:00
88cde17ea3 Surgery speed bonus revert/refactor (#2569)
## About The Pull Request

Skyrat reverts
- Removes the Skyrat surgery speed bonus for 3 tiles of free space
- Removes Skyrat surgery mood debuff

Removes tend wounds slowdown on on dead people. Replaces with a slowdown
on husks.
Slightly buffs tend wounds damage healed per cycle

Introduces new surgery speed bonuses, based on TG speed mods:
- Speed bonus for operating table
- Speed bonus for operating computer
- Speed bonus for using sterilizine/cryostylane now applies to all
surgery steps, not just the one where the reagent is applied
- Speed bonus for anaesthetics/painkillers

Visual feedback of what your surgery speed modifier is

## Why It's Good For The Game

The Skyrat check is dumb and doesn't solve any problems, rather creates
them with TC still being surgery central except now people are screaming
at you to move, which there isn't enough space to do in the TC anyways.

Two doctors working on a patient should not slow down surgery. This
should not count as a clean, quiet environment for lightspeed surgery:


![dirty-medbay2](https://github.com/user-attachments/assets/abe9dfa3-144a-4fae-a9eb-c65afa8d50ee)

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


https://github.com/user-attachments/assets/abea1be8-463c-451f-a58b-501600bab8f0

</details>

## Changelog

🆑 LT3
balance: Removed Skyrat surgery speed bonus
balance: Removed Skyrat negative mood events for surgery
balance: Removed operating tables automatically applying numbing
balance: Added surgery speed bonus for operating computers
balance: Added surgery speed bonus for anaesthetic/painkillers
balance: Added surgery speed bonus for sterilizine/cryostylane treatment
balance: Adjusted surgery speed penalty for stasis beds
balance: Removed speed penalty for tending wounds on dead bodies,
replaced with penalty for husked body
balance: Increased tend wounds healed damage per cycle
balance: Increased functional duration of sterilizine
balance: N2O is now eligible for the analgesia surgery bonus
balance: Surgery and treatment room scrubbers filter N2O by default
qol: Bubble notification for surgery speed and damage healed
qol: Medical HUD, health analyzer, and operating computer provide tend
wounds results
qol: Text log indicates what surgery bonuses are active, and which are
available
add: added lidocaine and sterilizine to surgery trays, NanoMed, and
NanoDrug
image: anesthetic machine is now breath machine, usable with all gas
types
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2025-01-12 16:10:39 -05:00
RoxyandGitHub 58417195e0 Fix Engineering plumbing constructor not being researchable (#2793)
## About The Pull Request

Add the engineering plumbing constructor design to the chemical
synthesis techweb node with the rest of the plumbing constructors
because `/datum/techweb_node/plumbing` is not a real thing

## Why It's Good For The Game

Bug fix

## Proof Of Testing

<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/c57cb654-9cb9-4d20-a942-fd2dcb794344)

</details>

## Changelog

🆑
fix: fixed the engineering plumbing constructor not appearing in
protolathes.
/🆑
2024-12-27 21:03:44 -08:00
+2 f930cc5476 immediate followup upstream merge (#1998)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Added new mechanics or gameplay changes
add: Added more things
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
sound: added/modified/removed audio or sound effects
image: added/modified/removed some icons or images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Jacquerel <hnevard@ gmail.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
2024-08-23 04:50:24 +00:00
Waterpig 96edb73e4a Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-08b 2024-08-14 00:21:40 +02:00
2e1a819c4f Novastation Synthetic Refactor Port (#29204)
* Bow Update: Fletching instruction manual, bows using projectile damage multipliers, unhardcoded bow sprites, hot pink death

* Conflict Removal

* Update bow_arrows.dm

* Update bow_arrows.dm

* tthis also update the actual bow & arrow code

* Update arrow.dm

* [MIRROR] Bow Update: Fletching instruction manual, bows using projectile damage multipliers, unhardcoded bow sprites, hot pink death [MDB IGNORE] (#3595)

* Bow Update: Fletching instruction manual, bows using projectile damage multipliers, unhardcoded bow sprites, hot pink death

* modularize bone dice(???)

* gives the cargo crate arrows

* conflict

* icon updates

rotates our bows the same way, adds invisible pixels for easier loading
to our primitive bows, removes bow/arrow icons that are clones of
upstream's

also a hack for arrow overlays on bows- currently just defaults to
default arrows if an overlay doesn't exist for it, but our only arrows
aren't that distinct with default arrows at that size (we do not have
alternative arrow overlay sprites)

* recipe changes

im not gonna try explaining everything here but the general idea is that
the cargo fletching kit is sorta novelty bows, and the big boy stuff you
get from smithing

* update ammo hud for bows

* this shouldn't be here

* i forgot to save these

cleans up the recipes, ashwalker arrows are just made by combining by
hand (you could already do this, the recipes were a noobtrap)
and the cargo kit is cheaper

* un-nerf the chaplain bow

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Fluffles <piecopresident@gmail.com>

* Refactor Synths away from /Robot/ limbs, Cybernetically augmented humanoids have alternative surgeries (#3970)

* [NO SELF SURGERY] Cybernetically augmented humanoids have alternative surgeries (both standard and advanced) [NO SELF SURGERY], as well as other misc additions

* 1

* p1

* Update limbs.dm

* oh yeah Taurs

* Limbs and Techwebs for them

* 3

* EMP

* Surgery Removals from Synths

* 5

* test

* Look Ma, no more surgery

* Update tgstation.dme

* Update hepatectomy.dm

* little bit more edit cleanup and diff reset

* Update surgery.dm

* Synth Organ Surgery!

* Update lungs.dm

* target

* 4

* Update synth_defines.dm

* you add the metal before the zap zap

* Apply suggestions from code review

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* 1

* Update code/modules/surgery/hepatectomy.dm

* Update code/modules/surgery/advanced/brainwashing.dm

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Fluffles <piecopresident@gmail.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update tgstation.dme

* fix stuff

* Update declarations.dm

* fix duplicate defines

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com>
Co-authored-by: Fluffles <piecopresident@gmail.com>
Co-authored-by: Zergspower <22140677+Zergspower@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Andrew <mt.forspam@gmail.com>
2024-08-11 19:56:17 +05:30
Waterpig 74160953d8 Upstream 24-07a 2024-07-03 23:29:42 +02:00
Waterpig 00aa495320 Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-07a 2024-07-02 23:57:38 +02:00
SpaceLoveSs13andGitHub 4e13b09bac Update all_nodes.dm (#28561) 2024-07-02 15:30:48 +05:30
SpaceLoveSs13andGitHub 2dd415de8a Adds RCD back to techweb (#28541)
rcd
2024-07-01 23:50:35 +05:30
SpaceLoveSs13andGitHub 84fe9b9901 Techweb defines (#28501)
* techweb

* more

* more2
2024-06-30 17:38:51 +05:30
1313a917fd [MIRROR] Techweb nodes DEFINED & bug fix (#28414)
* Techweb nodes DEFINED & bug fix

* Updates modular stuff

* Update all_nodes.dm

* Update all_nodes.dm

* Update microfusion_techweb.dm

* Update powerator.dm

* Update microfusion_techweb.dm

* Update microfusion_techweb.dm

---------

Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
2024-06-27 23:42:47 +05:30
SpaceLoveSs13andGitHub 0335d241df Fixes somethings in Modular nodes (#28311)
* Update all_nodes.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update all_nodes.dm

* I AM SO DUMBB

UGHGHG
2024-06-22 13:13:45 +05:30
SpaceLoveSs13andGitHub 44cf7d920b SAD ---> Cytology, MCR & Powerator Techweb requirement decrease. (#28310)
techweb moving
2024-06-22 10:33:30 +05:30
065fc837a6 [MIRROR] New Tech Tree (#28226)
* New Tech Tree

* ew

* wew

* e

* Modular Fix all

* Bluespace bag fix

* fixes broke

* Remove drill bit

* more fixes

* Update scipaper_partner.dm

* Update powerator.dm

---------

Co-authored-by: Andrew <mt.forspam@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
2024-06-21 09:55:26 +05:30
Waterpig 004e466cea Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406b 2024-06-08 14:33:29 +02:00
thegrb93andGitHub 681c3f63fc Artistic module fixes and make available at roundstart for any borg (#27980) 2024-06-04 14:37:34 +02:00
Waterpig 5da11912cb Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406a 2024-06-02 10:40:19 +02:00
NullFagandNullDagaf 1be1f657d2 DAISY BOOKS BEPEENIS ON TOP 2024-05-30 20:26:35 +00:00
Waterpig 7a8fe64633 Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into skyrat-upstream-04 2024-04-30 13:57:15 +02:00
Useroth 84f4c911d6 Merge remote-tracking branch 'origin/master' into serv-borg-rework 2024-04-30 03:35:35 +02:00
nevimer 45e52eb774 Merge remote-tracking branch 'skrat/master' into new-bubbermaster
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
#	_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
#	_maps/map_files/Birdshot/birdshot.dmm
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/MetaStation/MetaStation.dmm
#	_maps/map_files/NorthStar/north_star.dmm
#	_maps/map_files/VoidRaptor/VoidRaptor.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/shuttles/pirate_ex_interdyne.dmm
#	code/__DEFINES/mobs.dm
#	code/__HELPERS/~skyrat_helpers/is_helpers.dm
#	code/datums/mood.dm
#	code/game/objects/effects/spawners/random/random.dm
#	code/modules/admin/verbs/adminhelp.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/mob/living/brain/brain_say.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png
#	code/modules/uplink/uplink_items/job.dm
#	config/lavaruinblacklist.txt
#	icons/mob/actions/actions_changeling.dmi
#	icons/mob/clothing/mask.dmi
#	icons/obj/mining.dmi
#	modular_skyrat/master_files/code/modules/client/preferences/headshot.dm
#	modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm
#	modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
#	modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi
#	modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi
#	modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/metal_overlays.dmi
#	modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
#	modular_skyrat/modules/hyposprays/code/hypospray_kits.dm
#	strings/traumas.json
#	tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/headshot.tsx
2024-04-20 22:19:03 -04:00
WaterpigandGitHub 6bd5354b93 Fixes the dual inducers, opting to keep the tg one (#27227)
* removes remnants of the skyrat borg inducer

* begone
2024-04-18 03:00:07 +02:00
The SharkeningandGitHub 088930a7d6 (Early Pull) Fixes cyborg inducer duplication (#1380)
Fixes the inducers being duplicated on engineering cyborgs

https://github.com/Skyrat-SS13/Skyrat-tg/pull/27278
2024-04-11 19:47:53 +00:00
Waterpig 87b0f6c136 artistic 2024-04-11 12:08:15 +02:00
Waterpig e8f9767a11 Merge remote-tracking branch 'Skyrat/upstream-merge-81373' into upstream-2024-3 2024-03-03 10:55:23 +01:00
xXPawnStarrXxandGitHub f69c19a3d8 Alien toolset implants. (#26345)
* Add files via upload

* Update tgstation.dme

* Update medical_designs.dm

* Update all_nodes.dm

* Update medical_designs.dm
2024-02-06 16:21:14 -05:00
nevimer 4d8898fdef Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03
# Conflicts:
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/controllers/subsystem/statpanel.dm
#	code/datums/chatmessage.dm
#	code/datums/quirks/negative_quirks/claustrophobia.dm
#	code/game/objects/items/tools/weldingtool.dm
#	code/modules/client/preferences/middleware/quirks.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/living_say.dm
#	code/modules/modular_computers/file_system/programs/jobmanagement.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/research/designs/mechfabricator_designs.dm
#	code/modules/research/machinery/_production.dm
#	code/modules/surgery/organs/internal/_internal_organ.dm
#	html/changelogs/archive/2024-01.yml
#	modular_skyrat/modules/automapper/code/area_spawn_entries.dm
#	modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
#	modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
#	modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
#	tgstation.dme
#	tgui/packages/tgui/components/Dropdown.tsx
#	tgui/packages/tgui/components/Input.tsx
#	tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
#	tgui/packages/tgui/interfaces/Jukebox.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
#	tgui/packages/tgui/interfaces/common/SearchBar.tsx
2024-02-03 21:08:40 -05:00
The SharkeningandGitHub 596b5211c8 Gives medical borgs back their crew monitor (#969)
## About The Pull Request

Simply allows medical borgs to get the crew monitor upgrade again

## Why It's Good For The Game

We have a ton of medical chaos and they need a little help. This was
removed on Skyrat because of worries that borgs encroach on their job.
Are some of these worries valid? Yes. But medical here always has plenty
of work to go around.

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/ca65a5ce-8ee1-4756-8c7c-e37d53dad356)


## Changelog

🆑
balance: gives medical borgs back their crew monitors
/🆑
2024-01-14 16:28:34 -07:00
a713e8d460 cargo borg upgrades (#26017)
* cargo borg upgrades

* rename fix

* ha

* oh boy

* and thats the finish

---------

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2024-01-07 17:27:38 +00:00
StrangeWeirdKitten caedc98a30 Merge branch 'master' of https://github.com/skyrat-ss13/skyrat-tg into upstream-christmas 2023-12-31 09:09:28 -07:00
cb03437ae6 Add: Forked Cybernetic Tongue & Lizard Voicebox (#24616)
* Add cybernetic lizard tongue and lizard voicebox

* Cleaning up naming and flavortext for lizard cybertongues

* Remove erroneous can_speak_language override

* Add forked cybernetic tongue to cyber organs techweb node

---------

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-12-25 20:42:19 +00:00
nevimer f2b71e7686 Merge remote-tracking branch 'skrat/master' into upstream-nov-19-2023
# Conflicts:
#	_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
#	code/modules/mob/living/simple_animal/guardian/guardian.dm
#	html/changelogs/archive/2023-11.yml
#	modular_skyrat/master_files/code/datums/traits/neutral.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	modular_skyrat/modules/mold/code/mold.dm
#	modular_skyrat/modules/mold/code/mold_mobs.dm
2023-11-19 14:16:20 -05:00
BloopandGitHub 19b0d81127 Removes illegal tech from legally bought suppressors' deconstructor value (#24888)
* Removes suppressor from illegal tech

* Removes suppressor from illegal tech

* Makes a subtype of suppressor that are considered legal

Syndicate ones are now their own type.

* Update tgstation.dme

* Update armament_utility.dm
2023-11-12 14:54:58 -05:00
nevimer 10772c60ff Merge remote-tracking branch 'skrat/master' into upstream-oct-25-2023 2023-10-25 20:26:56 -04:00
bb8d8f968a [Mostly-Modular] Major refactor of most modular borg code with some QOL adjustments (#24542)
* The great BORG

* godamn my head

* how did that even compile

* Why do you keep reverting

* ah ticked

* Delete tallrobot_effects.dmi

* removes 'dogborg' language and cargo tweaks

* lol silly dog you dont have a custom panel yet

* that typo tho

* Forgot about that borg building

* Apply suggestions from code review

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>

* local edit

* Godamnit Hemlock

* re-deletes altborgs

* Update mechfabricator_designs.dm

* Revert "Update mechfabricator_designs.dm"

This reverts commit 569912fa2fadda9fbcdc83646e995405f33dfb24.

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-10-25 08:24:37 -07:00
nevimer 1d549b5c84 Merge remote-tracking branch 'skrat/master' into new-bubbermaster
# Conflicts:
#	code/__DEFINES/jobs.dm
#	code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
#	code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
#	code/modules/cargo/packs/imports.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	tgui/packages/tgui/interfaces/common/JobToIcon.ts
2023-10-01 22:02:51 -04:00
643dd04f1b [MODULAR] Attachable Soulcatchers (#23581)
* vacancy

* more code :3

* ui

* research

* Update nif_research.dm

* Update SoulcatcherUser.js

* a suggestion from a wise rat

* lore :3

* final touches

* sprites

* fixes an issue

* Update games.dm

* Apply suggestions from code review

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update attachable_soulcatcher.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-09-30 22:38:12 -04:00
68e8131e89 [MODULAR] Resleeving part one: RSD brain interface (#23525)
* interface item

* the surprise tool

* research

* lore

* Update rsd_interface.dm

* Update modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-09-30 22:15:15 -04:00
nevimer 12b25bf487 Merge remote-tracking branch 'skrat/master' into upstream-sept-24
# Conflicts:
#	.github/workflows/ci_suite.yml
#	_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
#	_maps/skyrat/lazy_templates/reebe.dmm
#	code/datums/quirks/negative_quirks/negative_quirks.dm
#	code/datums/quirks/neutral_quirks/neutral_quirks.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/modules/mining/equipment/kinetic_crusher.dm
#	code/modules/surgery/revival.dm
#	code/modules/uplink/uplink_items/device_tools.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/nri_military_surplus.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm
2023-09-24 13:40:53 -04:00
PintaandGitHub 47edfa05f0 [MODULAR] Meson NIF HUDs (#23509)
* the mesons

* Update nif_research.dm
2023-09-04 13:34:17 -07:00