Commit Graph

525 Commits

Author SHA1 Message Date
nevimer
f9e9525dc8 Merge remote-tracking branch 'skrat/master' into upstream-jul-24
# Conflicts:
#	_maps/map_files/Deltastation/DeltaStation2.dmm
#	_maps/map_files/tramstation/tramstation.dmm
2023-07-24 20:11:34 -04:00
SkyratBot
38dc811b6b [MIRROR] NEW STATION TRAIT: Radioactive Nebula [MDB IGNORE] (#22614)
* NEW STATION TRAIT: Radioactive Nebula

* Update job_boxes.dm

* Increase the intensity increment time so that shields will last longer

---------

Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-07-24 02:07:40 -04:00
SkyratBot
9ca698b679 [MIRROR] Adds circuit for bank machine. [MDB IGNORE] (#22583)
* Adds circuit for bank machine.

* Update code/modules/research/techweb/all_nodes.dm

---------

Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2023-07-19 15:26:09 -04:00
nevimer
29d9d1a49f Merge remote-tracking branch 'skrat/master' into upstream-remake-stop-commiting-to-master
# Conflicts:
#	.github/CODEOWNERS
#	code/__DEFINES/footsteps.dm
#	code/game/objects/items/spear.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/language/language_holder.dm
#	code/modules/mob/living/carbon/human/species_types/abductors.dm
#	code/modules/mob/living/carbon/human/species_types/ethereal.dm
#	code/modules/mob/living/carbon/human/species_types/felinid.dm
#	code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
#	code/modules/mob/living/carbon/human/species_types/plasmamen.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	modular_skyrat/modules/altborgs/code/robot_model.dm
#	modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm
#	modular_skyrat/modules/examinemore/code/examine_more.dm
#	modular_skyrat/modules/opposing_force/code/equipment/loadouts.dm
2023-07-19 02:18:09 -04:00
Hatterhat
76d520723c [MISSED MIRROR] Generic Crew-Available Status Readout Module - Continued (#22277)
* self mirror real

* trimmed fat

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
2023-07-12 06:27:30 +00:00
SkyratBot
381549f2f7 [MIRROR] service borg cookin fixin update [MDB IGNORE] (#22325)
* service borg cookin fixin update (#76590)

## About The Pull Request
PR done for bounty:
https://tgstation13.org/phpBB/viewtopic.php?f=5&t=33988
borgs can now turn on stoves and griddles
borg click code has been reworked a bit to be closer to base mob, you
are now able to click on stuff within reach rather than just Adjacent
(might be buggy to introduce this? hopefully not. if anything we can
testmerge this), which lets us make the apparatus work to pick up stoves
on the range and such
Adds the Codex Cibus Mechanicus as an upgrade you can research in RnD
with the other service borg ones. When you use it it shows you the
cooking menu!

![image](https://github.com/tgstation/tgstation/assets/23585223/5f881387-e0ba-4bb8-a9d6-ddc9d8fa9272)

## Why It's Good For The Game
The service borg has the tools to prepare ingredients, but it can't
actually do anything with them, which severely limits it, only being
able to do slapcrafted foods.
The apparatus not working on items that are on top of stoves/griddles
seems to be just a bug with how cyborg click code is handled.

## Changelog
🆑 Fikou
fix: service borg apparatus now works on stoves and griddles and ovens
qol: borgs can now activate stoves and griddles
add: rnd can research a cookbook for service borgs
/🆑

* service borg cookin fixin update

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
2023-07-09 11:16:10 -07:00
SkyratBot
02e36ec18e [MIRROR] Expanding the Experimental MODsuit Bepis Node with three new modules. [MDB IGNORE] (#21851)
* Expanding the Experimental MODsuit Bepis Node with three new modules. (#75801)

## About The Pull Request
So, I've had this idea to make a contribution to the Bepis feature with
some modsuit stuff. The gimmicky stuff is ok and a good way to even out
the better content since it has game of chance design it has (you can
find those disks in space anyway so...). However, the Experimental
MODsuit node feels very underwhelming right now, compared to how big
that feature is.

This PR adds three MOD modules to the Experimental MODsuit node, plus
two more:
- Magneto Charger: While the Modsuit is activated, each step the user
takes will charge the installed power cell by a tiny bit, enough to
sustain a standard modsuit of generic slow speed with only a few, easy
modules installed. It won't work in zero G, while flying, pulled by
someone else, on a conveyor belt, riding a vehicle or crawling on the
floor, though.
- Recycler: It collects (most) garbage and casings off the ground and
recycles them into material sheets that can be dispensed on an adjacent
location or storage with with Middle Mouse Button. Doesn't clean debris,
and scuffed because most trash doesn't yield material anyway.
- - It also has two subtypes, unbound from the node: one that dispenses
riot foam darts and can be found on the black market, and another that
dispenses the more innocuous foam darts, rarely found in maints.
- Shooting Assistant: A configurable module. On Stormtrooper mode, it
will give the user a faster fire rate (the double tap trait) at the cost
of accuracy. On Sharpshooter mode, it will improve the user accuracy and
make their shots ricochet against walls at least once (if the hit atom
allows that, that is, e.g. lasers don't ricochet against iron walls), at
the cost of movement speed. Both modes also prevent the user from dual
wielding guns.

To make the Stormtrooper mode stackable with the poor aim quirk and
refrain from making a new trait for the sharpshooter mode, the gun
spread code in gun.dm has also received a little refactor and cleanup.
Also, it's been tested.

## Why It's Good For The Game
The Experimental MODsuit node is quite shabby and could use something
extra to make it more appealing to MODsuit enjoyers.

Also doubles down as a small addition to the black market and maint
loot, and code cleanup, since gun code gives off some garbled vibes.

## Changelog

🆑
add: Expanded the Experimental MODsuit Bepis node with three new
modules: Magneto Charger, Recycler and Shooting Assistant.
add: Added a Riot Foam Recycler module to the black market, as well a
more innocuous version as maint loot.
/🆑

* Expanding the Experimental MODsuit Bepis Node with three new modules.

* update modular, I hate this file btw

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2023-07-01 14:21:47 -04:00
Waterpig
d2544a1333 Finishes up minesweeper (#267)
## About The Pull Request
Now that I know it works, final touches:

- [x] Went over the code to see if anything can be made better
- [x] Added back emagging with toned down, less destructive rewards
- [x] Added the arcade machine into research and as a spawn
- [x] Tested everything

(Mainly just stuff I forgot because I went thru like 70 errors and was
tired of it)


## Changelog
🆑
add: Minesweeper arcade machines finally introduced to the station
add: Reported overheats of certain minesweeper machines as a result of
tampering
/🆑
2023-06-28 17:44:19 -04:00
🦎
cf3c685bb7 Merge remote-tracking branch 'rodent/master' into 22-june-2023
# Conflicts:
#	.github/CODEOWNERS
2023-06-22 16:39:02 -04:00
Waterpig
b1fc4ede1c Adds crew monitors to Advanced biotech and lathes (#266)
## About The Pull Request
Rationale: Both this and the pinpointer can be purchased for the same
price from the vendor, but only one gets to be printable, which feels
kinda stupid.

Well not anymore, this adds the Handheld crew monitor under the Advanced
biotech node.

- [x] Tested

## Changelog
🆑
add: You can now print pinpointers
/🆑
2023-06-21 14:56:25 -04:00
Hatterhat
80b3507863 major, i'm burning up - medigun categorization jumpscare (#21855)
* deepwoken

* applying suggestions, thank you softcerv

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>

* drops a filler line

* where do these descs even show up

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2023-06-19 01:55:56 +01:00
SkyratBot
2e968e82cc [MIRROR] Hidden nodes no longer become visible when copying them to another Techweb [MDB IGNORE] (#21775)
* Hidden nodes no longer become visible when copying them to another Techweb (#75969)

## About The Pull Request

Copying techwebs did not take into account whether
available/researched/visible nodes were hidden in the techweb being
copied from, so copying a base techweb to another would reveal all the
bepis tech modules that are available but hidden.
## Why It's Good For The Game

Pretty big cheat. Although you can't print disks any more there are
Technology Disks lying around in science in most stations, so this still
exploitable.
## Changelog
🆑
fix: copying nodes from a techweb to another no longer reveals hidden
nodes
/🆑

* Hidden nodes no longer become visible when copying them to another Techweb

---------

Co-authored-by: A miscellaneous Fern <80640114+FernandoJ8@users.noreply.github.com>
2023-06-18 14:23:52 +01:00
nevimer
f6c63bdea1 Merge branch 'master' of https://github.com/bubberstation/bubberstation into overlay_june_13_2023
# Conflicts:
#	.github/CODEOWNERS
#	code/modules/cargo/packs/security.dm
#	code/modules/modular_computers/file_system/programs/jobmanagement.dm
#	code/modules/pai/pai.dm
#	modular_skyrat/master_files/code/datums/id_trim/jobs.dm
#	modular_skyrat/master_files/code/datums/traits/neutral.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
2023-06-13 20:04:57 -04:00
Icarus-The-Sun
a23c9635c2 Adds Hemophage Organs to the Limbgrower (#251)
<!-- 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
Adds the Hemophage organs to the limbgrower, requiring the xeno-biology
research node and a custom organ design disk. Each organ requires a
small amount of synthflesh and blood. Also adds a Hemophage tab to the
limbgrower. Tested in game!
<!-- 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. -->

## 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 it's 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: Adds Hemophage(Corrupted) Organs to the Limbgrower
add: Adds Hemophage Organ Design Disk to the Xeno-Biology research Node
add: Adds Hemophage tab to Limbgrower
/🆑

<!-- 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. -->
2023-06-06 13:48:47 -04:00
Pinta
fa5136cad8 [Like 99% Modular] Soulcatchers (#20576)
* wew

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* Update soulcatcher.dm

* file moving

* tgui

* tgui_work

* wew

* more tweaks

* more stuff

* fancy

* nifsoft

* mob

* whoopsie

* man

* mind transfer

* ooc and flavor text

* Update soulcatcher_component.dm

* Update soulcatcher_mob.dm

* persistence

* hud

* a little bit of admin logging, as a treat

* Update soulcatcher_component.dm

* Update devices.dmi

* research

* some things I missed.

* whooops

* Update soulcatcher_component.dm

* Update soulcatcher_items.dm

* Update soulcatcher_component.dm

* lore

* Update soulcatcher_component.dm

* Update soulcatcher.dm

* Apply suggestions from code review

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

* Update soulcatcher_items.dm

* Apply suggestions from code review

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

* Update soulcatcher_component.dm

* Update tgui/packages/tgui/interfaces/Soulcatcher.js

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>

* >w>

* moves the body component

* Update tgstation.dme

* renaming

* file move

* oh wow, I didn't need to make this non modular

* signals

* Update handheld_soulcatcher.dm

* more touches

* Update soulcatcher_mob.dm

* code suggestions

* Update handheld_soulcatcher.dm

* Update handheld_soulcatcher.dm

* Apply suggestions from code review

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>

* Update soulcatcher_component.dm

* a

* more signals :3

* This is a surprise tool that will be added back later.

* better UX

* Update soulcatcher.dm

* QoL

* Spamming reduction.

* Update nifs.dm

* Update handheld_soulcatcher.dm

* Update soulcatcher_component.dm

* Update soulcatcher_component.dm

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

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

* Update soulcatcher_component.dm

* Update soulcatcher.dm

* no more empty bodies

* 1984

* whoopsie

* transfer fix

* Update mobs.dm

* more logging

* Update soulcatcher_component.dm

* QoL

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
2023-06-01 17:28:29 -04:00
SkyratBot
f3d405da28 [MIRROR] Modular Shield Generators, Also Adds a new perimeter algorithm to _helpers/math_dm [MDB IGNORE] (#21426)
* Modular Shield Generators, Also Adds a new perimeter algorithm to _helpers/math_dm (#75328)

Disclaimer im mostly making this pr for the experience if anything.
Also anyone can replace the sprites if they want to I`m just making them
so itl be done, idk what a plasteel machine is supposed to look like.

The circuit boards to make these machines are unlocked by the advanced
power manipulation tech

The entire shield

- Has one big healthpool (base of 50)
- Has a configurable radius
- Takes damage from hot gas and emp
- Has regeneration (it gets nerfed by alot of things that I have to talk
about separately)
- When the shield is broken the generator must regenerate at 0.25x speed
before coming online again
- can be configured to either only generate a shield externally (in
space) or both internally and externally at the cost of half the regen
rate
- Regen rate is also reduced based on the ratio of the shield radius and
the max radius that the generator is capable of generating
- Alot more that im too tired to explain at the moment

The base stats of the shield (max health, regen rate, max radius) all
scale with the tier of parts used in the main generator.

4 other machines (3 are finished code-wise as of now) the charger (regen
rate), the relay (max radius) the well (max health) the node (allows for
more connections) can all be connected to the main generator to boost
its core stats based on their part tiers

In the future there is a possibility of specialization / modifications
to the forcefield at the cost to the core stats

* Modular Shield Generators, Also Adds a new perimeter algorithm to _helpers/math_dm

---------

Co-authored-by: moocowswag <62126254+moocowswag@users.noreply.github.com>
2023-05-25 23:13:30 +01:00
nevimer
759c2dd73a Merge remote-tracking branch 'upstream/master' into overlay
# Conflicts:
#	.github/CODEOWNERS
#	_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
#	_maps/RandomRuins/SpaceRuins/bus.dmm
#	_maps/RandomZLevels/blackmesa.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/VoidRaptor/VoidRaptor.dmm
#	_maps/map_files/generic/CentCom_skyrat_z2.dmm
#	_maps/shuttles/skyrat/goldeneye_cruiser.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	_maps/templates/lazy_templates/wizard_den.dmm
#	code/__DEFINES/callbacks.dm
#	code/__DEFINES/jobs.dm
#	code/__DEFINES/~skyrat_defines/gun.dm
#	code/datums/components/fertile_egg.dm
#	code/datums/components/transforming.dm
#	code/datums/elements/bane.dm
#	code/datums/votes/map_vote.dm
#	code/game/objects/items/AI_modules/hacked.dm
#	code/game/objects/items/food/egg.dm
#	code/game/objects/items/melee/baton.dm
#	code/game/objects/items/stacks/sheets/glass.dm
#	code/game/objects/structures/flora.dm
#	code/game/objects/structures/morgue.dm
#	code/modules/antagonists/fugitive/hunters/hunter.dm
#	code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm
#	code/modules/antagonists/traitor/objectives/kidnapping.dm
#	code/modules/art/statues.dm
#	code/modules/events/ghost_role/changeling_event.dm
#	code/modules/events/spacevine.dm
#	code/modules/mining/machine_redemption.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/pistol.dm
#	code/modules/projectiles/guns/ballistic/rifle.dm
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png
#	code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png
#	code/modules/uplink/uplink_items.dm
#	code/modules/vending/autodrobe.dm
#	config/config.txt
#	config/game_options.txt
#	config/maps.txt
#	config/skyrat/skyrat_config.txt
#	html/changelogs/archive/2023-03.yml
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/under/costume.dmi
#	icons/mob/inhands/clothing/shoes_lefthand.dmi
#	icons/mob/inhands/clothing/shoes_righthand.dmi
#	icons/mob/inhands/clothing/suits_lefthand.dmi
#	icons/mob/inhands/clothing/suits_righthand.dmi
#	icons/mob/species/human/human_face.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/under/costume.dmi
#	modular_skyrat/master_files/code/datums/components/fullauto.dm
#	modular_skyrat/master_files/code/datums/traits/negative.dm
#	modular_skyrat/master_files/code/datums/traits/neutral.dm
#	modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
#	modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/revolver.dm
#	modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi
#	modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi
#	modular_skyrat/modules/aesthetics/guns/code/guns.dm
#	modular_skyrat/modules/aesthetics/guns/icons/guns.dmi
#	modular_skyrat/modules/blueshield/code/blueshield.dm
#	modular_skyrat/modules/blueshield/code/medkit.dm
#	modular_skyrat/modules/blueshield/code/special.dm
#	modular_skyrat/modules/customization/modules/clothing/under/misc.dm
#	modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm
#	modular_skyrat/modules/events/code/event_overrides.dm
#	modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm
#	modular_skyrat/modules/manufacturer_examine/code/manufacturer_component.dm
#	modular_skyrat/modules/mapping/code/mob_spawns.dm
#	modular_skyrat/modules/modular_weapons/code/rifle.dm
#	modular_skyrat/modules/novaya_ert/code/automatic.dm
#	modular_skyrat/modules/sec_haul/code/guns/guns.dm
#	modular_skyrat/modules/tribal_extended/code/weapons/bow.dm
#	tgstation.dme
#	tgui/packages/tgui/interfaces/OreRedemptionMachine.js
#	tgui/packages/tgui/interfaces/VotePanel.tsx
2023-05-20 21:59:27 -04:00
coldud13
53293cfb53 [MANUAL MIRROR] R&D Monitoring console TGUI + Can see RD consoles (#72987) (#21131)
R&D Monitoring console TGUI + Can see RD consoles (#72987)

## About The Pull Request

I wrote this while constantly rushing lol

This PR does many things, the largest is that the R&D Monitoring console
(the RD's one) is now TGUI
It also changes how researching loggings work, bringing the RD console
and NtosRD app on par with eachother

The type of person is also logged differently, instead of ``Cyborg:
[name]`` and ``User: [name]``, humans do not have a prefix and cyborgs
will say ``CYBORG [name]``. ``research_logs`` also works differently now
to make it easier to reference each needed data from the list.

Lastly, I added the ability to see R&D consoles from the console, and
the ability to remotely un/lock them down. This currently is pretty
useless as it can't control the tablet app variant, and anyone with
Science access can just unlock it, however with some minor future
changes I think this can be turned into a good way for the RD to get
control of their department.

Video demonstration, mostly (I made a few edits after this):

https://user-images.githubusercontent.com/53777086/215005387-817106f4-5237-4f2e-b0ac-da28e6a17f9c.mp4

## Why It's Good For The Game

This console is overhyped by the game, being hidden behind an RD-locked
Command-colored door, in the same room as one of the most damaging theft
objectives, yet it is one of the most useless and forgotten consoles in
R&D if you don't count everything outside of researching, experiments
and robotics.

This adds a nice TGUI menu while making it a little more worthwhile to
use.

## Changelog

🆑
balance: The R&D monitoring console now shows R&D consoles and their
locations.
refactor: The R&D monitoring console now has a nice TGUI menu.
/🆑

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2023-05-15 16:45:30 +01:00
SkyratBot
5e9d2379bf [MIRROR] Stock Part Resprite [MDB IGNORE] (#21014)
* Stock Part Resprite

* wew

* alright

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-05-09 04:10:18 +01:00
SkyratBot
88e4c08a98 [MIRROR] New Medical job: The Coroner [MDB IGNORE] (#20963)
* New Medical job: The Coroner

* Fixes coroner (code-side) (#21005)

* Fixes coroner

* Update jobs.dm

* trailing newline

* wew

* VR Replacements

* w

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-05-08 03:44:11 +01:00
SkyratBot
22f68874f4 [MIRROR] Service Borger Upri- Kitchen Upgrades [MDB IGNORE] (#20909)
* Service Borger Upri- Kitchen Upgrades

* Update robot_model.dm

---------

Co-authored-by: Dawnseer <126404225+Dawnseer@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-05-03 00:10:27 -07:00
Pinta
5a055577c2 [MOSTLY MODULAR] Time Clock (#18448)
* the start

* moves the file

* icons

* framework

* Update console.dm

* Update console.dm

* TGUI

* Update console.dm

* Update console.dm

* god I am tired.

* Update console_tgui.dm

* Head of staff change

* sounds

* admin logging

* Map edits

* research design

* Update console.dm

* requested map changes

* trim refactor

* Update console.dm

* admin logging

* Update VoidRaptor.dmm

* a

* Update VoidRaptor.dmm

* Boy, I really hope somebody got fired for that blunder.

* Alert level locking

* manifest updates

* Update console.dm

* Update console_tgui.dm

* Update console_tgui.dm

* Update modular_skyrat/modules/time_clock/code/console.dm

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

* Update modular_skyrat/modules/time_clock/code/console.dm

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

* Update modular_skyrat/modules/time_clock/code/console_tgui.dm

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

* file move

* Create machine.dm

* Update console.dm

* hehe whoooooops

* new sprites

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-04-23 20:48:49 -04:00
SkyratBot
5d66a77c49 [MIRROR] Refactors Navigational Beacons [MDB IGNORE] (#20471)
* Refactors Navigational Beacons

* Update all_nodes.dm

---------

Co-authored-by: Profakos <profakos@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-04-12 20:11:00 +01:00
SkyratBot
3a5a1d4058 [MIRROR] Imports and Contraband: Different! Cargo crates without locks! MEAT! [MDB IGNORE] (#20423)
* Imports and Contraband: Different! Cargo crates without locks! MEAT!

* helping make 20423 a little more mergeable (commits to a nonmaster branch) (#20434)

* regal condor my beloved

* damn ok

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>

* [merges to pr 20423, get this first] more nitpicks in regards to the imports pr (#20497)

missed mirror and a nitpick i forgot

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-04-12 20:03:30 +01:00
SkyratBot
6f3befe233 [MIRROR] Reagent soup / Soup rework / Stoves - A kitchen expansion [MDB IGNORE] (#20410)
* Reagent soup / Soup rework / Stoves - A kitchen expansion

* fixes that stuff

* puts the range stove on maps that sohuld have it

* fixes some paths that don't exist anymore

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2023-04-08 13:30:41 -04:00
SkyratBot
9faf2a16ec [MIRROR] Removes bepis Techweb and reworks tech disks in general [MDB IGNORE] (#20102)
* Removes bepis Techweb and reworks tech disks in general

* e

Co-Authored-By: san7890 <the@san7890.com>

* e

* it will be done

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2023-03-29 22:19:32 +01:00
GoldenAlpharex
057d4ab998 Polarized Windows: Component Edition (#19907)
* First bits of code for the polarized controller component

* Hopefully finished the component

* Finishes the code for some fully-functioning polarized windows

* Adds the polarization_controller to the global list on Initialize, instead of removing it (whoops)

* Makes the window polarization remote controller printable and gives it an examine hint to explain how to change its ID

* Adds a polarizer_id variable to the window spawner, for mappers, to avoid making a billion subtypes
2023-03-27 04:38:11 +01:00
SkyratBot
7ad441e407 [MIRROR] More stuff to construct & destroy [MDB IGNORE] (#19903)
* More stuff to construct & destroy (#73942)

## About The Pull Request
**1. Suit Storage Units**
- What about them?

1. You can print "suit storage unit" circuit boards from engineering &
science circuit printer's after research to make more suit storage
units, now since they behave like regular constructable machines you can
deconstruct them via screwdriver & crowbar.
   2.  You can upgrade its capacitor to get faster charging speeds

- Why its good for the game?
   1. You can rebuild these in the event they get destroyed
   2. Better tier capacitors = faster charging speeds
3. More storage units = More places to decontaminate your equipment +
Recharge more mod suits made in robotics
4. If you decide to leave the game or your done using a mod suit e.g. a
mining mod suit rather than keeping it to yourself or throwing it away,
just build a suit storage unit and hang it there so other players can
use it i.e., sharing is caring.

**2. Freezer Cabinet**
- What about them?
 1. They are now craftable

![Screenshot
(133)](https://user-images.githubusercontent.com/110812394/224561037-5461be22-e651-4d72-8afc-f797bb7d8a47.png)

  3. You can deconstruct them with a welding tool.

- Why its good for the game?
  1. You can now make more of them if they get stolen/destroyed
  2. More places to store food, dead bodies, whatever

**3. Flood Lights**
- What about them?
They can now be fully deconstructed in the exact opposite sequence you
constructed them.
  - First use screwdriver to open its panel
  - Then use empty hand to remove light
  - Then use screwdriver to unscrew the wiring from frame
  - Use wire cutter to remove wiring completely
  - Finally use wrench to completely deconstruct frame

- Why it's good for the game?
Reclaim used material to build flood light else where . Also much more
clean than what the wiki is suggesting.

![Screenshot
(134)](https://user-images.githubusercontent.com/110812394/224561553-f44a97f3-ac70-49e7-892f-1a05e2323ecb.png)

  ## Changelog
🆑
add: suit storage unit circuit boards to engineering & science
department circuit printers.
add: freezer cabinet as a craftable & destructible item.
qol: flood light can now be deconstructed rather than destroyed/thrown
away.
/🆑

---------

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

* More stuff to construct & destroy

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
2023-03-16 18:41:12 -04:00
Gandalf
999e96cb2f [MIRROR] Improved engineering tools patch 2: Bolter Wrench (#72445) (#19875)
Improved engineering tools patch 2: Bolter Wrench (#72445)

This adds a new wrench that can be printed after Advanced Engineering is
researched or as a rare mail gift for engineers.

The Bolter Wrench is medium sized (fits on toolbelts and bags but not on
boxes) and can grab into the bolting system of airlocks, raising it's
bolts after a 5 second `do_after`, even if the airlock has no power or
the wires are cut, as long as you can access the inner wires. (Won't
work if the panel is closed or has it's wires reinforced.)

Codersprite blatantly inspired by Iconoclast's wrench and looks like
this:

![bolting](https://user-images.githubusercontent.com/55374212/210415159-dbac7990-46bb-4d42-9061-dd0278905937.png)

![Iconoclasts](https://user-images.githubusercontent.com/55374212/210415375-80070c25-91f9-40bb-aa62-889fc8f0b206.gif)

Right now, the only way to fix a powerless bolted down airlock is by
fixing the power first, this becomes an issue if the APC is behind the
airlock.
If that is the case, the only way in is to break through walls/windows
or destroy the airlock if you can, both add more things you need to
repair, making reconstruction times longer and longer...

Or you use an RCD to delete the airlock in 5 seconds, while faster than
the above method still is another thing to the repair list...

Repairing damaged and bolted down airlocks is such a hassle that
doormag'd airlocks bypass the default deconstruction system and just let
you deconstruct them directly without the steps of unbolting and
welding, something that could be removed with this tool but I won't
defend the pros and cons of it now.

Reconstruction is slow and cumbersome without an RCD. (And even with
one...)
I've been trying to make it smoother without using RCDs or a future RAT
on previous PRs and future ones to come, this tool is part of those
plans.
🆑 Guillaume Prata
add: Bolter Wrench as a new tool, it can raise the bolts of airlocks
regardless of it's power status to smoother station repairs. It can be
printed and is unlocked on the same tier as RCD. It can also rarely be a
mail gift for engineers.
/🆑

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2023-03-15 01:02:26 +00:00
Gandalf
3d461fc097 [MANUAL MIRROR] [MIRROR] Rapid Wiring Device(RWD) (#72802) (#19758)
Rapid Wiring Device(RWD) (#72802)

Just a big roll of cable(7 stacks worth of cable) you carry around it
has the following features
1. Dual wield it and just walk across plating to lay new cable. Make
sure you wear insulated gloves
2. If you just have it in one of your hands it can pick up any stray
cable pieces lying around
3. Right click on it to dispense a custom amount of cable
4. Refill with cable
5. Alt click to change cable layer
6. Available in autolathe & engineering protolathe round start

https://user-images.githubusercontent.com/110812394/213224959-f393e849-2e0a-4314-ab0e-c10924cf8fce.mp4

1. Clean up cable pieces bitten by rats and lay fresh cable in
maintenance very quickly.
2. For big construction projects. Carrying one big roll of 7 stacks of
cable is much more storage efficient than carrying 7 separate stacks
individually.
3. For wiring Solars very quickly

Also, I'm pretty sure something like this exists in real life so why
not. It's just the rapid pipe cleaner but for cables.

🆑
add: Rapid wiring device
imageadd: Sprite for RWD
/🆑

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
2023-03-10 07:27:13 +00:00
SkyratBot
6c978308c7 [MIRROR] Completing experiments after their associated nodes have been researched gives back a partial refund of the discount lost [MDB IGNORE] (#19743)
* Completing experiments after their associated nodes have been researched gives back a partial refund of the discount lost (#73814)

## About The Pull Request

So we're like simultaneously moving two vague directions with research.
One being "experisci grants discounts for prohibitively expensive nodes
so you want to do the experiments to discount them" and the other being
"Let's give Heads of Staff a way to research anything they want without
any communication to the research department, including the very
expensive nodes that scientists may be working on"

You already see the issue, right? You can't have your cake and eat it
too.

It sucks for scientists to be working on a complex experiment like
weapons tech for that huge 90% discount only for the HoS to stumble onto
the bridge and research it anyways. Your time is wasted and RND is
slowed down massively.

We can do something to assuage that.

This PR makes it so completing an experiment which discounts already
completed nodes will refund a partial amount of the discount that
would've applied.

For example, researching industrial engineering without scanning the
iron toilets will refund ~5000 points.

This can only apply once per experiment, so if an experiment discounts
multiple technologies, they will only get a refund based on the first
technology researched.

## Why It's Good For The Game

This accomplishes the following:

- Expensive research nodes with difficult experiments remain expensive
without completing the experiments. If no one does the experiment, they
act the same as before.
- Expensive research nodes with very easy experiments (but time
consuming) no longer put RND on a time crunch to beat the itchy trigger
finger of the Heads of Staff. Stuff like scanning lathes allow the
scientists to work more at their own pace: they can talk to people or
maybe stop at the bar or kitchen between departments without feeling
pressure to get it done urgently.
- Scientists are able to complete experiments which previously were no
longer deemed relevant if they need a point injection. Experiments left
behind are no longer completely useless bricks. Maybe even gives
latejoin scientists something to do.
- Scientists mid experiment can still complete it to not feel like their
time is wasted.

Overall I think this has many benefits to the current science system
where many have complaints.

## Changelog

🆑 Melbert
qol: Completing an experiment which discounts a researched tech node
will give a partial refund of the discount lost. For example,
researching the industrial engineering research without scanning iron
toilets will refund ~5000 points if you complete it afterwards. This
only applies once per experiment, so experiments which discount multiple
nodes only refund the first researched.
/🆑

---------

Co-authored-by: san7890 <the@ san7890.com>

* Completing experiments after their associated nodes have been researched gives back a partial refund of the discount lost

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
2023-03-09 20:08:46 +00:00
Cyprex
59b587131a Merge from upstream 2023-03-03 19:22:13 +01:00
yourdoom9898
e03da3958b Re-adds Medical Borg pinpointer (#63) 2023-03-02 18:43:31 +01:00
Bloop
ab6db14578 [SEMI-MODULAR] Fixed Vox clowns not spawning with their job masks, added some job-related vox gas masks with new filters, and a misc balaclava fix (#18614)
* Vox clowns and mimes now spawn with their masks, added gas mask filters for vox

Fixed vox clowns and mimes not spawning with their job-related masks.

Added said job related masks.

* Moved the gas masks out from breath and into gasmask.dm

* Fixes unused proc from tg that is used on Skyrat

give_important_for_life() proc is a cleaner way to do the vox outfit-giving but I noticed it was not working. The proc itself was bugged, fixed it.

* Update species.dm

* Revert "Update species.dm"

This reverts commit 5b737965f573258211dc219fb6399284cdee8749.

* Revert "Fixes unused proc from tg that is used on Skyrat"

This reverts commit 3d8219a347cee0c17e99d4de32f5ebb3d70585cb.

* Fixes give_important_for_life() proc

give_important_for_life() proc is a cleaner way to do the vox outfit-giving but I noticed it was not working. The proc itself was bugged, fixed it.

* revert skyrat edit, wait for upstream PR to merge

* Fixes potential issue with null jobs, handle vox outfits properly for 'other vox'

* Removed gas filtering flags on the clown and mime masks

* Fixes a balaclava that made you go bald

* Created missing sprites for the alternate versions

Now you can change the style with the radial menu

* ocd edit

* No longer needed as it is handled within equip

* Merge conflict update..

* No longer needed after the update to equipOutfit

Opening internals in hand slots is now done automatically there #19054
2023-02-10 14:27:57 +00:00
Pinta
75692d71e6 [MODULAR] Replacces the NIFSoft Vendor with a PDA app (#18955)
* start

* It's now a PDA app

* Update nifsoft_catalog.dm

* nice

* 🦀

* NIF GHOST BOX NIF GHOST BOX

* price updates

* whoops

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update nifsoft_catalog.dm

* a

* Update wardrobes.dm

* Update wardrobes.dm

* Update nifsoft_catalog.dm

* Update NtosNifsoftCatalog.js

* Update modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm

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

* Update wardrobes.dm

* Update nifsoft_catalog.dm

* Update wardrobes.dm

---------

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-02-08 02:31:00 +00:00
SkyratBot
ce40d90888 [MIRROR] Add clown firing pin to techweb [MDB IGNORE] (#19013)
Add clown firing pin to techweb (#72930)

## About The Pull Request
This adds the clown firing pin to the `Clown Technology` node.

## Why It's Good For The Game

Clown technode should have all the funny clown items. The firing pin is
something you get from cargo, but I think it's okay to have it as a
techweb item since it requires `bananium` which is one of the rarest
ores in the game.

## Changelog
🆑
qol: Add clown firing pin to techweb
/🆑

Co-authored-by: Tim <timothymtorres@gmail.com>
2023-01-31 02:14:38 +00:00
SkyratBot
b652076529 [MIRROR] Add mining scanners to techweb [MDB IGNORE] (#19010)
Add mining scanners to techweb (#72931)

## About The Pull Request
This adds basic mining scanners to the `Mining Technology` node

## Why It's Good For The Game

A mining scanner is a basic tool, much like mesons or a bag.

It should be available to any person who wishes to mine for ore. There
are a limited number of them on the station that can run out and this is
a good way to encourage more people to mine since it's apart of the
basic kit.

## Changelog
🆑
qol: Add mining scanners to techweb
/🆑

Co-authored-by: Tim <timothymtorres@gmail.com>
2023-01-31 02:13:55 +00:00
SkyratBot
7f87f5067d [MIRROR] Adds the universal scanner to lathes [MDB IGNORE] (#19044)
Adds the universal scanner to lathes (#73006)

## About The Pull Request
Adds the basic tool back to autolathes and cargo protolathe
This was in the game before #70314 so I think it's a fix more than an
addition, but whatever
## Why It's Good For The Game
Sometimes I like to sell things from custom vendors and I don't want to
have to hunt down a roundstart cargonian just to get a price tagger.
## Changelog
🆑
add: You can print universal scanners (export scanners, price taggers,
sales taggers) from the lathe again
/🆑

---------

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2023-01-31 02:11:18 +00:00
SkyratBot
3a2dc61acb [MIRROR] Add advanced fire extinguisher to techweb [MDB IGNORE] (#19011)
Add advanced fire extinguisher to techweb (#72933)

## About The Pull Request
This adds the advanced fire extinguisher to the `Experimental Tools`
node.

## Why It's Good For The Game

There are several advanced engineering tools in this node. This is an
item that is considered a better version of a regular fire extinguisher
for atmos techs. It makes sense to put this with the other upgraded
tools in techweb, since ya know, it's technically an advanced version.
It does spawn empty, so it needs to be refilled with a foam tank
dispenser.

## Changelog
🆑
qol: Add advanced fire extinguisher to techweb
/🆑

Co-authored-by: Tim <timothymtorres@gmail.com>
2023-01-29 02:13:15 +00:00
SkyratBot
3954fd1a94 [MIRROR] Adds the 2 new components to the techweb [MDB IGNORE] (#18953)
Adds the 2 new components to the techweb (#72910)

## About The Pull Request

Adds the 2 new components I made in my prior PR to the basic circuit
research

also fix an issue with associative pick list

## Why It's Good For The Game

 Being able to print them would be usefull

Reason I didn't notice was properly since I ran on debug station and it
never crossed my mind that they where research thingy

## Changelog
🆑
fix: You can print the new list pick and associative list pick
components
fix: Associative list pick works as intended now
/🆑

Co-authored-by: Autisem <36102060+Autisem@users.noreply.github.com>
2023-01-26 14:29:38 -05:00
Pinta
ae198af4d9 [MOSTLY MODULAR] NIFs (#18349)
* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit c2aea213fd400f9d6d12d955340cb0e7d2f9c36f, reversing
changes made to 1bb613b64a603c280abec40d9c82fde69248b196.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 10a6f906f70857cfffd9ddef7b609fecc21da902.

* we don't need this (for right now)

* Update nifsoft_shop.dm

* new nif models

* Update nif_implants.dm

* we now have items

* nice

* logging and removers

* Update nifs.dm

* nif repair surgery

* death durability loss and EMPs

* more messages and NIF TGUI fix

* polish

* debug NIF and soulcatcher polish

* new phone action sprite

* NIFs for ghost roles

* Better EMP

* this doesn't really have a good reason to be here.

* lore

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update code/controllers/subsystem/ticker.dm

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

* Update nif_implants.dm

* a

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update nifs_tgui.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/hivemind.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Apply suggestions from code review

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

* fixes an oversight

* Apply suggestions from code review

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

* that wouldn't be good

* Update packs.dm

* Update nifs.dm

* Update nif_implants.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update misc_devices.dm

* Update dualboot.dm

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update hivemind.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update packs.dm

* Update prop_summoner.dm

* Update shapeshifter.dm

* Update packs.dm

* Update nif_presistance.dm

* Update prop_summoner.dm

* Update dualboot.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Tastyfish <crazychris32@gmail.com>

* static data

* Update persistence.dm

* Update persistence.dm

* Update persistence.dm

* uhoh

* Update nif_presistance.dm

* Update nifs.dm

* pain

* Revert "pain"

This reverts commit 3adc919f849b68de2ab4245c7db26a02e85bf0c6.

* I don't know why this was in here

* Update nifsofts.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update shapeshifter.dm

* Update nifs.dm

* Update nifs.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update prop_summoner.dm

* Update misc_devices.dm

* Delete BlueShift_upper.dmm

* Update prop_summoner.dm

* Update prop_summoner.dm

* vendor

* R&D

* Update nifsoft_shop.dm

* Update dualboot.dm

* Update NifPanel.js

* Update money_sense.dm

* I'm sorry for what I must do

* Update money_sense.dm

* cost adjustments

* theme

* Update nifsoft_shop.dm

* examine fix

* examine text change

* Money Sense is now a trait

* Revert "Money Sense is now a trait"

This reverts commit 16c124ffb2cb70136abe6eb41b330d389208afa7.

* component

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* we do a bit of file moving

* component

* Update nifs.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit a7f7945eaa9c9ed6f9253b7cb71c6be79f3bf9e9, reversing
changes made to bca1a7f1811d3a82bf253c5a8d70431567c399a7.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit bca1a7f1811d3a82bf253c5a8d70431567c399a7, reversing
changes made to 2559afc7a9737863f7d96494e01216a1ea0f5428.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit e8293971b07a2ffbe61a7e17d5f9ac94b47ef5bc, reversing
changes made to dad4ef7a9ac697d0e887c336bd486c17fb54f2a8.

* whoops

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit c607aca6bc3e55cc724f25fa6e38011b05ebc8c6.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit b42f89b9c647d845a17732f1caaf1a50dcdd4515.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 1d6ffe92bcaa8035f8918dc533870ec4b74ed9a3.

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* fixes things

* Update nifs.dm

* QoL

* no more summoning infinite items

* start of componentization

* Update prop_summoner.dm

* FIRMLY GRASP IT!

* Update prop_summoner.dm

* Update prop_summoner.dm

* Update nifsofts.dm

* Update prop_summoner.dm

* Update nifsoft_shop.dm

* boy, I really hope somebody got fired for that blunder

* Update nif_presistance.dm

* mistakes were made.

* Delete CentCom_skyrat_z2.dmm

* Revert "Delete CentCom_skyrat_z2.dmm"

This reverts commit 8a1cdc4b065246fb07cbaf5461d01565e0ddbe06.

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* It's a solution

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update NifPanel.js

* Price changes

* Update nif_presistance.dm

* Such devastation, this was not my intention.

* Woooo!

* Documentation

* cryo fix

* I am sorry to anyone that had a NIF before the persistence change

* Update nif.dm

* I need to figure out why this is happening.

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* a

* Update modular_persistence.dm

* Update modular_persistence.dm

* Update nifs.dm

* Update nifs.dm

* I do the code

* Hopefully this helps

* Update ticker.dm

* Update modular_persistence.dm

* Removes client requirement

* Use brain, much better for allowing persistent organs and similar in the future.

* Did testing, it fucking works now.

* Update mind_linker.dm

* Update misc_devices.dm

* Update misc_devices.dm

* Update nifs_tgui.dm

* Thanks gamers :^)

* a

* Update nifsoft_shop.dm

* Update nifsofts.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* whoops

* FUUUUCK

* FUCK x2

* this feels like cargo job gear

* stack trace

* roundstart fix

* Update modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm

Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>

* Update modular_persistence.dm

* Update nifs.dm

* Update hivemind.dm

* Update nifs.dm

* vital spelling fix

* whoopsie

* Update nif_persistence.dm

* power_refactor

* durability refactor

* a

* Update nifsofts.dm

* pain

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update nifsofts.dm

* Update packs.dm

* Update nifs.dm

* Update nifs.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: RimiNosha <riminosha@gmail.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
2023-01-24 14:27:00 -08:00
Zergspower
1c5549831e The great Unfuckening of all the tech/mechfab categories (#18673)
* Finally Sanity

* Update robot_items.dm

* leftover

* multi-cell oops

* tweak

* suggested

* Match upstream Research category for integrations sake

* Revert "Match upstream Research category for integrations sake"

This reverts commit 5ad819888368c07ee992bc9facf36872a12041fb.

* Fixes Newlines
2023-01-21 16:41:45 -05:00
SkyratBot
2a8f93b2bf [MIRROR] Ties research servers to Techwebs and de-hardcodes research point gen [MDB IGNORE] (#18735)
Ties research servers to Techwebs and de-hardcodes research point gen

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2023-01-19 21:20:43 +00:00
Zergspower
d92ed5fec6 Adds Prescription Science glasses (#18790)
* Done

* Viro science loadout
2023-01-18 13:29:07 +00:00
SkyratBot
27492ff60d [MIRROR] Autounlock techwebs are shared between machines that use them. [MDB IGNORE] (#18734)
* Autounlock techwebs are shared between machines that use them. (#72515)

## About The Pull Request

Did you know that for every Autolathe, Limbgrower, Biogenerator, ORM,
and Smelter that was built, an entire new techweb was made? The average
round has 2 ORMs (smelters count) if not more from ORM deconstruction
objective, 2 biogenerators, several autolathes and generally 0-1
limbgrower, I think there's more techwebs being created than we need.

Creating a whole techweb was a pretty terrible way to optimize this, so
I made a global list that stores these techwebs. Created on demand,
these autounlocking techwebs now share between the machines that use
them. It also generate all hacked nodes which will be visible if the
machine is hacked, instead of 'researching' them for each hacked
individual machine.

The 'specialized' techweb subtype was removed because its sole purpose
was to allow autounlocking to be a subtype of it. Now autounlocking is
just the direct subtype. I also removed mechfab autounlocking type
because it wasn't used, mechfabs use techwebs directly.

Autolathes and Limbgrowers now locally store 'imported designs' which
are things uploaded from technology disks. Outside of this, the
autounlocking techweb subtype now stores 'hacked designs' which unlocks
when the machine is emagged.
While doing this, I saw ORMs and Biogenerators had disks you can insert
into them, but I did not find anything that can actually be uploaded to
them (I saw Alien Alloys as a possibility, but there's no such disk to
allow uploading this alloy to the machine, and I didn't think an entire
system for 1 single alloy was worth keeping around), so I removed this
unused feature from both machines.

I merged 'Hacked' and 'Emagged' categories because they served the same
purpose, 'hacked' being on hacked autolathes and 'emagged' being on
hacked (emagged) limbgrowers.

Tech disk techwebs (which is created every time a disk is made, however
I hope to change this in the future) into it's own subtype, so admins
understand where its from when looking in VV panel (because I was
confused when I saw them at first).

``autolathe_crafted`` proc was removed because it was entirely unused
too.

Now it looks like this, which I consider an improvement:

![image](https://user-images.githubusercontent.com/53777086/211052875-9215a84d-fb04-450b-a120-4d0316cec6ff.png)

## Why It's Good For The Game

We no longer initialize a brand new techweb for no reason whatsoever.
Each techweb made is making entire lists of experiments and research
papers, all of which is never to be seen in-game and is completely
useless to the player. Cutting down on these techwebs is a good first
step to this needless initializing.

## Changelog

🆑
qol: Removed the tech disk part of the ORM's UI as it was entirely
unused, now it's a little more compact with less scrolling needed.
refactor: Autolathes, Limb growers, Biogenerators, ORMs and Smelters now
share techwebs with other machines of their types, rather than all make
new techwebs each time. This means they only build their nodes once,
including hacked ones. Instead of researching nodes on hacking the
machine, they now show hacked ones depending on if it's hacked.
/🆑

Co-authored-by: Zephyr <12817816+ZephyrTFA@ users.noreply.github.com>

* Autounlock techwebs are shared between machines that use them.

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zephyr <12817816+ZephyrTFA@ users.noreply.github.com>
2023-01-14 18:54:19 -08:00
SkyratBot
a3d2bc53ae [MIRROR] RTD Rapid Tiling Device [MDB IGNORE] (#18546)
* RTD Rapid Tiling Device

* Update tool_designs.dm

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2023-01-12 22:15:08 +00:00
SkyratBot
0b751964b0 [MIRROR] Removes gibber showing up twice in the R&D console [MDB IGNORE] (#18219)
* Removes gibber showing up twice in the R&D console (#71988)

## About The Pull Request

Removes the gibber showing up twice in the R&D console, which has likely
been unnoticed for so long because of how similar their sprite is to the
food processor.

## Why It's Good For The Game

Minor bug fix that I found annoying when I noticed it.

## Changelog

🆑
fix: Gibbers no longer show up twice in their techweb node.
/🆑

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

* Removes gibber showing up twice in the R&D console

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2022-12-19 18:30:45 +13:00
Dani Glore
3d6e95c8f0 Add: Cybernetic Tongue & Augments Tweak (#17561)
* Add cybernetic tongue organ with new sprite

* Add cybernetic tongue to techweb designs and Augment+ menu. Add changes to tgstation.dme

* Add cybernetic tongue to /datum/techweb_node/cyber_organs

* Update Cybernetic Tongue sprite and description.

* Change cybernetic tongue design to use '4 SECONDS' instead of 40

* Change default organ augment name to 'Default'

* Rename Organic Tongue to Human Tongue

* Change augment limbs and organs to use intended names

* Rename Human tongue augment_item to Organic tongue

* Add defines LIMBS_DEFAULT_NAME and ORGANS_DEFAULT_NAME to limbs_and_markings.dm
2022-12-15 16:41:24 -05:00
SkyratBot
2b800b9a23 [MIRROR] Removes tablets (not PDAs) entirely. [MDB IGNORE] (#17880)
* Removes tablets (not PDAs) entirely.

* contractor changes

* map changes

* Update assistant.dm

* conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-07 01:07:02 +00:00
SkyratBot
3a713d0157 [MIRROR] Mech camera [MDB IGNORE] (#17832)
* Mech camera

* conflicts

* extra hud icons

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-12-03 14:26:59 -08:00