Commit Graph

1101 Commits

Author SHA1 Message Date
shayoki eb008e505e maps IV 2026-06-03 03:29:02 -05:00
shayoki d98b451cec maps III 2026-06-03 03:18:29 -05:00
shayoki 999e6aaa43 maps II 2026-06-03 02:28:59 -05:00
shayoki cbb7c90890 maps 2026-06-03 01:45:18 -05:00
shayoki f601a6ddaf Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026 2026-06-03 01:23:54 -05:00
HometownFunky 5739c883d9 Removes Armadyne Combat Gloves' innate shockproofness (#5625)
## About The Pull Request

So, turns out the Armadyne Combat Gloves in the secvendor (and loadout)
available to sec were subtypes of the combat gloves.
<img width="539" height="160" alt="inherit"
src="https://github.com/user-attachments/assets/a587f136-3ff4-4c00-a049-d4680e904b23"
/>
This meant that they were fully insulated to boot. It's a 50 credit
glove item that secoffs can get for 10 credits, and there are 6 in each
sec vendor.
<img width="85" height="98" alt="gloves"
src="https://github.com/user-attachments/assets/0a8ad937-d05d-4a4a-987e-f5a4c8407428"
/>
~~This brings the siemens_coeff down to the levels of the standard issue
black gloves, which is 0.5~~
This makes the gloves a subtype of color/black
<!--Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

I feel this was an oversight, as I don't think security is meant be able
to get round start insulation.
## Proof Of Testing

~~It's a one line change.~~ It's no longer a one line change, it never
is.........
<img width="299" height="153" alt="cobm"
src="https://github.com/user-attachments/assets/4c9261bc-a2e4-4393-a0b4-59e1d042c2d2"
/>
Here is the compiled version IN the away mission that gave it the
conflict
## Changelog
🆑
balance: Armadyne Combat Gloves are no longer a combat glove subtype
/🆑
2026-05-20 17:08:18 +02:00
Alexis 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00
Yobrocharlie 336b529c9e More maintsrooms changes (#5469)
## About The Pull Request

The maintsroom is a passion project of love, slowly but surely I hope to
make this gateway be something genuinely special to be enjoyed by most
people, im not trying to do anything specific rather just- broad appeal.

## Why It's Good For The Game

the vision, bug fixes, and improoving player experience while removing
softlocking.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
Softlock prevention
<img width="445" height="315" alt="image"
src="https://github.com/user-attachments/assets/161df46e-77ad-4231-9d5c-687280fda81b"
/>
Hint of where to get the keycard to progress, the text is hard to read
but thats fully intentional
(This is written in a lore friendly manner and is written by somebody
addressing the person reading the note directly)
<img width="708" height="347" alt="image"
src="https://github.com/user-attachments/assets/7dcd4035-7daf-4b2b-96ec-95ab8d164331"
/>
Xenomorph name select and description working properly
<img width="1224" height="682" alt="image"
src="https://github.com/user-attachments/assets/b2e6eb9a-523c-4eb5-bd6e-a517e560833b"
/>

</details>

## Changelog

Slight adjustments to the map in preparation for the next PR which will
be adding a megafauna boss

Adds hints to the players telling them how to progress and adds multiple
keycards to certain areas to prevent players from taking the one keycard
and then leaving softlocking everybody else out of progression

Fixes an issue with the xenomorphs in which they could not select their
name and description now they can.

(The additions do not need to be player facing as said CL will be
covered in the next PR as i plan to do no tests between this PR and the
next PR)
🆑
fix: Fixed maintsrooms xenomorphs not being able to choose their
name/desc
/🆑
2026-05-13 12:47:18 -04:00
ElGitificador 51c387295c fixes the Heretic gate med cam appearing on ss13 cams (#95853)
## About The Pull Request
removed it s "ss13" and "medbay" network tag and added heretic_gate
instead, having defined said network as well. IDK if the network is
really necessary, afaik no other cam in the gate uses it, so your call
## Why It's Good For The Game

dat. should fix #95786 
## Changelog
🆑
fix: fixed heretic gate cam appearing in on station ss13 network
/🆑
2026-04-28 13:13:15 +02:00
Ben10Omintrix 7763db34a1 Basic beepskies and some ED209 additions (#95783)
## About The Pull Request
this PR refactors beepskies and ED209s into basic mobs. ive also added a
few features for the ed209 because i cant keep my hands to myself:

ED bots can now wear hats! a few hats give them some new unique
dialogue. Putting a cowboy's hat on an ED will have it acting like a
town Sherrif

EDs are now rideable when emagged. theyll still be shooting people while
ridden. youll also have the ability to charge at people full throttle
running them over

ive also added a new Nukie variant, purchasable from the uplink. These
versions come fitted with an LMG and will patrol the station and shoot
all walks of life. If emagged, theyll blow up people with (weaker)
rockets (im still working on balancing this). they are rideable but i
highly suggest against it; youll be caught in the crossfire. (i
understand if ud prefer i atomize this feature)

## Why It's Good For The Game
gives some personality to EDs, as well as updating all these bots to the
cool new ai system

## Changelog
🆑
refactor: beepskies, and ed209s have been refactored. please report any
bugs
add: ed209s can now wear hats! some hats give them new dialogue
add: emagged ed209s are now rideable! 
add: added evil versions of the ed209s to the syndie uplink
/🆑

---------

Co-authored-by: san7890 <the@san7890.com>
2026-04-25 00:25:28 +00:00
Yobrocharlie 510cec967e Adds a naval cannon to a naval ship. (#95745)
<!-- 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

It was always the intention for this to be there
I just didnt have the will power to do this until recently
special thanks to junglerat and isitdarkii on discord for helping with
the code and spriting respectively
 
## Why It's Good For The Game

a nice setpiece, but also its arguably- not.
a balance adjustment will need to be made later down the line if these
ever want to be used in game for anything other than just a set piece,
they can still totally be used to kill people- theyre just stuck in a
gateway that has anti-teleport so its whatever

## Changelog

Also added 1 more hmg for map symmetry, moved the SAM site on the ship
to the back, added two 40mm cannons to the front of the ship.
<img width="310" height="747" alt="image"
src="https://github.com/user-attachments/assets/9ab3790a-5df3-473d-924e-c793c25e1262"
/>


🆑
add: The heretic gateway now has a 40mm cannon in it.
/🆑

<!-- 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. -->

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
2026-04-19 23:01:11 +01:00
Yobrocharlie 55ea6c3707 Sovl Removal from academy (#95780)
## About The Pull Request

Nerfs a few things about it, anchors some thigns that I meant to be
anchored

## Why It's Good For The Game

Apparently inert means, less charges and not intert as in no charges.

## Changelog

Removes some stuff and does some nerfs

🆑
fix: Removes inert wands of fireball and healing from the academy,
apparently inert doesnt mean not working but just fewer charges.
/🆑
2026-04-17 13:01:43 +02:00
Yobrocharlie b25ad1a016 Makes the maintsrooms xenomorphs not hostile (#5414)
<!-- 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

Converts the xenomorphs in the maintsrooms to be non reproductive, non
evolving and non hostile to the crew

## Why It's Good For The Game

Gateway antagonists are (in general) poor a poor idea.

## Proof Of Testing

Tested it, and it works. (if its still a branch that means it doesnt
work)

## Changelog

cleared out a bit of space in front of the tavern called the "edge of
the universe" so that its not blocked along with moving 1 shaggoth and 1
hound of tindalos so the turrets dont just shoot endlessly (as often)

made the xenos not hostile to crew (neutral technically so if you shoot
them they can shoot you)

🆑
balance: Made the maintsrooms xenomorphs friendly
/🆑

<!-- 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: Alexis <catmc8565@gmail.com>
Co-authored-by: gavla <96078776+shayoki@users.noreply.github.com>
2026-04-16 20:12:07 -05:00
Yobrocharlie d40756f9e0 [fix] Deletes old unused maps removing bloat. (#95769)
## About The Pull Request

Both of these gateways are disabled in the config for reasons, i tried
to fix those reasons but got apathy in response, now they are simply
bloat in the codebase

## Why It's Good For The Game

less bloat

## Changelog

-2 maps

🆑
del: Removed the snowdin and caves maps
/🆑
2026-04-15 11:40:16 +12:00
Yobrocharlie 33f3b3effa More maintsrooms fixes (#5401)
## About The Pull Request

Fixes some oversights, some stuff that meant to be removed, nerfs the
xenos a lot until they are entirely overhauled to- not be so hostile.

## Why It's Good For The Game

itterative development i am very greatful for all of the playtesters

## Proof Of Testing

it works as intended

</details>

## Changelog

fixes more stuff with the maintsrooms

🆑
fix: fixed the maintsrooms more.
/🆑
2026-04-11 08:57:56 -06:00
Yobrocharlie e782c104f5 Maintsroom fixes (#5383)
## About The Pull Request

This PR is to fix several issues with the maintsrooms gateway, the
maintsroom was balanced around nova DPS- nova has on average, a lot more
DPS available to the crew so this aims to make things a bit easier- at
the beginning at least, also adds more lore and makes the notes proper
notes instead of var eddits.

## Why It's Good For The Game

Stops people from dying from 20 300 hp blobbernauts that moved as fast
as the player.

## Proof Of Testing

Tested in local, it works.

## Changelog

Less enemies, more time to react to enemies

🆑
balance: Made the maintsroom slightly easier
/🆑
2026-04-11 08:53:30 -06:00
Yobrocharlie d73107d90b small maintsroom fix (#5318)
<!-- 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

removes 4 mobs that spam d-chat.

the map has never been run so it doesnt matter to do a CL

Co-authored-by: gavla <96078776+shayoki@users.noreply.github.com>
2026-04-11 08:53:21 -06:00
Isratosh abfad4d12e Fix master CI xenochitin repath (#95735) 2026-04-10 22:47:17 -05:00
SmArtKar 93ea8085cb Datumizes material effects, slots, and material spears (#95341) 2026-04-11 09:15:07 +10:00
Tim 14c77736e7 Slot Machine DLC - Diversified Debt for Every Department (#95513)
## About The Pull Request
This PR takes the improvements from:
- #95313

And builds on it quite a bit. Slots now have:
- New symbol icons based on SS13 objects instead of Font Awesome icons
- Several new slot machine subtypes for every department
- New slot machine random spawner that is used to replace all slot
machines on all maps
- ~~Greyscaled the slot machine sprite and replaced it with GAGs (to
color them by department)~~
- New rare trap/hazard abilities depending on symbols (syndiebomb =
flashbang, handcuffs = cuff, singulo = shock, etc.)
- Syndie slot machine that comes preinstalled in all syndie
outposts/nuke bases
- Slot machines circuits can be configured with a screwdriver to change
the type and emagging results in the syndicate version
- Tweaked the pixel offset for the jackpot flashing icon so it is in the
correct position
- Improved the name generator with more adjectives and nouns for all
subtypes (ex. clown slot machine = "Lucky Giggles")
- IDs and Department budget cards can be linked as the owner of the slot
machine, however NT takes a 40% cut off the profits since jackpots/bonus
spins are paid out by NT

##### And yes... there is a clown and mime subtype... honk

## Why It's Good For The Game

<img width="1503" height="791" alt="dreamseeker_t8lLODECva"
src="https://github.com/user-attachments/assets/597355be-aee0-483a-82a4-7f8d6fa9ae90"
/>

Better slot machine icons and code.

## Changelog
🆑
add: To help cover budget expenses, NT has redesigned and installed new
slot machines that are themed by department. Slot machines can also be
linked to bank accounts via ID cards or department budget cards. NT
takes a 40% cut of profit to payout major jackpots and bonus spins.
Please gamble responsibly.
map: Replaced all slot machines with slot machine random spawners. Added
syndicate slot machines to Syndicate bases and nuke outposts.
/🆑

---------

Co-authored-by: Lucy <lucy@absolucy.moe>
2026-04-03 15:25:31 +01:00
Yobrocharlie d1301078e4 Academy redone (#95298) 2026-03-29 05:16:53 +02:00
Leland Kemble 7dc7a789d3 Snow cabin fake holy wand keeps its sprite (#95490)
## About The Pull Request

Makes the var edited fake healing wand in snow cabin a real subtype

## Why It's Good For The Game

closes #95484
2026-03-25 16:30:29 -05:00
shayoki a2e8a61b68 maps ci VI 2026-03-11 11:42:37 -05:00
shayoki a64fda912b maps ci V 2026-03-11 11:25:39 -05:00
shayoki 43e8699020 maps ci IV 2026-03-11 08:33:42 -05:00
nevimer 85d2594bd0 Merge remote-tracking branch 'origin/master' into upstream-feb12-2026
# Conflicts:
#	_maps/map_files/moonstation/moonstation.dmm
#	tgstation.dme
2026-03-10 17:10:57 -04:00
nevimer 5882ff4a12 updatepaths commit 2026-03-10 16:45:13 -04:00
Yobrocharlie 89632591f8 New gateway (#5260)
<!-- 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 a new gateway which is like the half life gateways step brother in
terms of gameplay except more dangerous and less intuitive while being
more entertaining and offering more interactions at the same time, this
one is ported from nova but will offer a smidge less loot and be a
smidge more brutal due to the differences in server balance and culture

## Why It's Good For The Game

admin funny.
wont be rotation and will be reliant on admins specifically enabling it
during the round for people to access it.

## Proof Of Testing

Tested and loaded in local, works as intended

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

</details>

## Changelog

🆑
add: Added a new gateway for admins to fuck around with.
/🆑

<!-- 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. -->
2026-03-07 10:18:15 -06:00
MrMelbert ef28e00690 [MDB Ignore] Refactors gauze, adds Tourniquets (#95041)
## About The Pull Request

1. Refactors gauze

Removes gauze var from `/stack`, adds a shared parent between tape and
gauze.
Behavior of "sticking thing on limb" is now a bit more generic, with
there being a component to facilitate it and a framework on `/bodypart`

Closes #92990

2. Adds Tourniquets

A first aid item, when attached to a limb it reduces blood loss from
that limb by 90%.
However while attached you walk slower (if on a leg), interact slower
(if on a arm), and yes, you rapidly die if you put it on your head

Paramedic belts have their starting equipment changed again for the
500th time.
Surgical tape -> Tourniquet
Bone gel -> Bonesetter

<img width="604" height="224" alt="image"
src="https://github.com/user-attachments/assets/443dd5c0-44a3-4ccb-9f6a-c561bbf2fba9"
/>

## Why It's Good For The Game

Adds some more variety for field treatment of bleeding wounds, and in
the future we can add things like "improvised tourniquets" or
"improvised splints" with wooden planks.

## Changelog

🆑 Melbert
add: Adds Tourniquets. While attached to a limb, reduces blood loss from
that limb by 90%, but makes you walk / interact slower. (Or if you put
it on your head, you die.)
add: You can purchase Tourniquets from the premium section of the
medical vendor
add: Paramedic belt setup has changed yet again: Surgical tape replaced
with Tourniquet, Bone gel replaced with Bonesetter.
add: You can use all forms of tape as splint - like Gauze. Will secure a
fracture but won't stop your blood from exiting.
refactor: Refactored gauze entirely, report any strangeness with it (or
tape, or tourniquets)
/🆑
2026-02-15 08:30:57 +01:00
nevimer 00ccf0c6b5 Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/compile_changelogs.yml
#	.github/workflows/stale.yml
#	SQL/database_changelog.md
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	code/__DEFINES/atom_hud.dm
#	code/__DEFINES/inventory.dm
#	code/__DEFINES/mobs.dm
#	code/__DEFINES/species_clothing_paths.dm
#	code/__DEFINES/subsystems.dm
#	code/__DEFINES/surgery.dm
#	code/__HELPERS/global_lists.dm
#	code/_globalvars/lists/maintenance_loot.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/minor_mapping.dm
#	code/controllers/subsystem/processing/quirks.dm
#	code/controllers/subsystem/shuttle.dm
#	code/datums/components/palette.dm
#	code/datums/components/surgery_initiator.dm
#	code/datums/diseases/advance/advance.dm
#	code/datums/hud.dm
#	code/datums/mood.dm
#	code/datums/mutations/chameleon.dm
#	code/datums/quirks/negative_quirks/nyctophobia.dm
#	code/datums/status_effects/debuffs/debuffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/slime/slime_leech.dm
#	code/datums/weather/weather.dm
#	code/game/data_huds.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/frog_statue.dm
#	code/game/objects/items/rcd/RLD.dm
#	code/game/objects/items/robot/items/hypo.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/items/stacks/wrap.dm
#	code/game/objects/items/storage/garment.dm
#	code/game/objects/items/tools/medical/defib.dm
#	code/game/objects/items/weaponry.dm
#	code/game/objects/items/weaponry/melee/misc.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/curtains.dm
#	code/game/objects/structures/dresser.dm
#	code/game/objects/structures/girders.dm
#	code/game/objects/structures/maintenance.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/admin/greyscale_modify_menu.dm
#	code/modules/admin/verbs/light_debug.dm
#	code/modules/antagonists/ashwalker/ashwalker.dm
#	code/modules/antagonists/heretic/knowledge/starting_lore.dm
#	code/modules/antagonists/ninja/ninjaDrainAct.dm
#	code/modules/art/paintings.dm
#	code/modules/client/preferences.dm
#	code/modules/client/verbs/ooc.dm
#	code/modules/clothing/head/wig.dm
#	code/modules/events/disease_outbreak.dm
#	code/modules/holodeck/holo_effect.dm
#	code/modules/jobs/job_types/head_of_security.dm
#	code/modules/jobs/job_types/security_officer.dm
#	code/modules/library/skill_learning/generic_skillchips/point.dm
#	code/modules/mining/lavaland/ash_flora.dm
#	code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/basic/guardian/guardian.dm
#	code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defines.dm
#	code/modules/mob/living/carbon/life.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mod/mod_control.dm
#	code/modules/mod/modules/modules_general.dm
#	code/modules/modular_computers/computers/item/computer_ui.dm
#	code/modules/paperwork/paper.dm
#	code/modules/paperwork/paperbin.dm
#	code/modules/power/lighting/light.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/projectiles/projectile.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/food_reagents.dm
#	code/modules/reagents/chemistry/reagents/other_reagents.dm
#	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
#	code/modules/research/xenobiology/crossbreeding/_clothing.dm
#	code/modules/research/xenobiology/crossbreeding/prismatic.dm
#	code/modules/surgery/advanced/brainwashing.dm
#	code/modules/surgery/advanced/lobotomy.dm
#	code/modules/surgery/amputation.dm
#	code/modules/surgery/blood_filter.dm
#	code/modules/surgery/bodyparts/_bodyparts.dm
#	code/modules/surgery/brain_surgery.dm
#	code/modules/surgery/cavity_implant.dm
#	code/modules/surgery/coronary_bypass.dm
#	code/modules/surgery/gastrectomy.dm
#	code/modules/surgery/healing.dm
#	code/modules/surgery/limb_augmentation.dm
#	code/modules/surgery/organ_manipulation.dm
#	code/modules/surgery/revival.dm
#	code/modules/surgery/sleeper_protocol.dm
#	code/modules/surgery/surgery_helpers.dm
#	code/modules/surgery/surgery_step.dm
#	code/modules/unit_tests/_unit_tests.dm
#	code/modules/unit_tests/designs.dm
#	code/modules/unit_tests/icon_state_worn.dm
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_cultist.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png
#	code/modules/unit_tests/screenshots/screenshot_husk_body.png
#	code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png
#	icons/map_icons/clothing/head/_head.dmi
#	icons/map_icons/clothing/shoes.dmi
#	icons/map_icons/items/_item.dmi
#	icons/mob/huds/hud.dmi
#	icons/mob/inhands/64x64_lefthand.dmi
#	icons/mob/inhands/64x64_righthand.dmi
#	icons/obj/machines/computer.dmi
#	tgui/packages/tgui/interfaces/OperatingComputer.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/types.ts
#	tgui/packages/tgui/interfaces/SurgeryInitiator.tsx
#	tools/icon_cutter/check.py
2026-02-12 23:50:09 -05:00
Bloop 86a5caf594 Lets sinks mount to floors (#95062)
## About The Pull Request

That's all. 

The sprites clearly have a pedestal which is attached to the floor. They
shouldn't behave as if they are free floating wash basins.

<details><summary>example: a barber shop</summary>

<img width="614" height="818" alt="StrongDMM_ahHbCymkjR"
src="https://github.com/user-attachments/assets/aeee4090-e209-4ad7-8d1d-fef9dcbb36e2"
/>

</details>

Also runs the UpdatePaths script so it can collapse some duplicate tiles
which have been annoying me with diffs each time it's run.

## Why It's Good For The Game

More mapping flexibility for bathrooms and medical spaces.

## Changelog

🆑
code: sinks can be mounted to floors
/🆑

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
2026-02-08 18:48:53 -05:00
Josh af3521d830 remove ferry console from away mission (#94994)
## About The Pull Request

Removes a ferry console from the heretic beach away mission

## Why It's Good For The Game

It allows players to call the ferry shuttle to the station and access
CC, which shouldn't be possible outside of admin intervention

## Changelog

🆑
fix: Removed a ferry console which should not be at the heretic beach
🆑

Co-authored-by: Josh Powell <josh.powell@softwire.com>
2026-01-26 11:31:27 -05:00
Leland Kemble 7558dc8e4b Replaces instances of mapped in normal wooden barricades on top of objects with crude wooden barricades (#94755)
## About The Pull Request

We've all seen that thing that happens where you open a door in
maintenance, and a large barricade of wood materializes where the door
just was. That's not right. The obvious solution would be to make the
barricade appear on top of the door beforehand, and while that works in
terms of behaviour, it looks really weird:
<img width="82" height="82" alt="image"
src="https://github.com/user-attachments/assets/e2c170d8-8a3d-4f09-80a4-976c525bed9f"
/>
and even weirder on objects such as windows & shutters. I suppose that's
why you're not able to build them on top of these things in actual
gameplay.

Instead, this replaces every instance of a mapped-in wooden standard
barricade that appears on top of an object (save for one on top of a
girder in icebox) with a crude barricade, causing it to both appear on
top of the object and look right doing so.

Additionally, comes with a linter for big barricades on top of airlocks
& windows.

## Why It's Good For The Game

It doesn't look weird nor act weird. Even aside from the airlocks, these
things are weird with windows, acting like they're inside the glass.

Additionally, while this does technically reduce their integrity,
increase projectile passing rate & reduce plank drop amount, so I'm
labeling it balance out of good faith, the only actual balance
implication this has is that the barricade being on top of the door
prevents it from being opened via a simple bump, which could and does
effect atmos situations, but I'd sooner call that a bugfix than a
balance change.

## Changelog
🆑

balance: wooden barricades mapped on top of objects are now crude
barricades, preventing them from materializing when you open a door.

/🆑
2026-01-07 17:57:31 -05:00
mcbalaam 3799968eb3 feat: new floppy disk sprites; most disks are now under the /item/disk type; adds disk stacking, uqinue styling and wrapping (#94112)
## About The Pull Request

Floppy disks received a sprite upgrade, as well as unique wraps:

<img width="364" height="150" alt="image"
src="https://github.com/user-attachments/assets/0ac433e3-7432-4c06-bec2-aeae00b6852f"
/>

<img width="786" height="527" alt="image"
src="https://github.com/user-attachments/assets/0f36bd0d-0362-4431-8131-49060a2fe348"
/>

You can now stack floppy disks! They also scatter around when thrown.
The video also showcases new styling options with a selection of
stickers! You can also write something on the disk instead of selecting
an icon:


https://github.com/user-attachments/assets/ff0a8542-9d79-4108-ae46-672ca5d620a2

MOST disks now inherit the `/item/disk` type to properly stack and do...
stuff. An updatepaths script included.

## Why It's Good For The Game

Old school is cool. Stacking disks makes them feel more authentic, while
styling allows for more crearivity!

## Changelog

🆑
add: New unique wraps for floppy disks
qol: Floppy disks can now be stacked
image: New sprites and stickers for floppy disks
map: Added and ran an updatepaths script
refactor: Most disks are now under the base disk item type
/🆑

---------

Co-authored-by: The-Tyrant <tyrantofgaming@gmail.com>
2026-01-04 08:52:18 +13:00
Yobrocharlie 6d68960af9 Gateway progression skip fix (#94583)
Just adds some stuff to stop people from progressing in an un-attended
way.

🆑
fix: fixed being able to skip the first puzzle in the new gateway
/🆑
2025-12-25 00:13:55 +01:00
Leland Kemble 50f25c5b9d [MDB IGNORE] Offstation piping & cabling lookover (#94445)
## About The Pull Request

Looks over all offstation map files save for shuttles & bitrunning
domains for piping & cabling defects, inefficiencies, & deviations from
standard design. Any defects explainable as the result of damage have
been ignored, obviously. As usual, no pieces of equipment other than
piping & cabling were moved.

A few gameplay-effecting issues were addressed:

The Icebox Thing ruin's medical section had a scrubber disconnected from
the main line.
The Lavaland Beach Biodome had an injector for its scrubber line into
the outdoors, but as the outdoors are unpowered it has been replaced
with a passive vent.
The Lavaland Surface Gas Station's oxygen tank was on the incorrect
piping layer. This tank has also become an air tank, instead.
The Lavaland Surface Gas Station's central air vent was disconnected.
The Film Studio's crew's bedroom's vents were disconnected.
The Haunted Trading Post(space donk co ruin with the AI chamber) was
surrounded by electrical grille spawners, but these spawners spawn
yellow cables while the ruin uses red cables. They have been replaced
with a new layer 1 electrified grille spawner.
The Waystation ruin was hotwired due to electrical grille spawners.
The "Research" gateway's Dorms & Medbay APCs were disconnected.

A few maps have an incredibly large amount of useless cables, these
being the Icebox gas station & comms agent outpost, & the interdyne
space ruin. These cables are being left in under presumption of intent.

One map, the "the_outlet" space ruin, has air pipes leading to all of
its air alarms, for an indiscernible reason. These pipes are also being
left in under presumption of intent.

## Why It's Good For The Game

Just because they're all dead or criminals doesn't mean they like
wasting credits on piping, or that they don't have standards.

Solves the issues mentioned above.

## Changelog
🆑

map: A great deal of offstation structures have been given more
efficient piping & cabling.
map: Several offstation structures have had piping & cabling issues
resolved.

/🆑
2025-12-17 00:21:22 +00:00
nevimer 6e9f2ccfc0 Merge remote-tracking branch 'tgstation/master' into upstream-12-15
# Conflicts:
#	.github/workflows/compile_all_maps.yml
#	.github/workflows/run_integration_tests.yml
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	code/_onclick/hud/credits.dm
#	code/controllers/subsystem/networks/id_access.dm
#	code/datums/diseases/advance/advance.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/game/machinery/doors/door.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/antagonists/malf_ai/malf_ai_modules.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/loadout/categories/accessories.dm
#	code/modules/loadout/loadout_helpers.dm
#	code/modules/loadout/loadout_items.dm
#	code/modules/loadout/loadout_preference.dm
#	code/modules/mob/living/silicon/robot/robot_defense.dm
#	code/modules/mod/mod_theme.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/reagents/reagent_containers/cups/drinks.dm
#	code/modules/shuttle/mobile_port/variants/supply.dm
#	code/modules/surgery/organs/internal/eyes/_eyes.dm
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_heretic.png
#	icons/hud/screen_full.dmi
2025-12-15 18:12:29 -05:00
shayoki e5d7ace953 reducing mapping runtimes 4 2025-12-14 02:59:23 -06:00
shayoki d05c5bd80d reducing mapping runtimes 3 2025-12-14 01:15:39 -06:00
Bloop 376588db04 Some list optimizations, heretic ruins optimization (#94386) 2025-12-13 08:27:31 +01:00
SyncIt21 f640a0e972 Enhances algorithm for finding an atom mount (#94076)
## About The Pull Request
Depends on #94064 for the unit test but offers a better method for
finding an atom to mount on
- Finding a mount now takes into consideration the objects pixel x & y
offsets meaning diagonal mounting is now supported. Gives great
flexibility for mappers
- If you don't want to use pixel offsets but default back to using the
objects direction that behaviour is still preserved. Useful if your
object uses directional icon states(lights & cameras for now) AND don't
use offsets
- If no direction could be specified then as the last resort it defaults
back to the objects local turf for mounting

## Changelog
🆑
fix: all mounted objects on tables, fences, windows & walls should fall
of correctly when the atom it is placed on is destroyed
fix: security telescreen now falls off when their mounted wall is
destroyed
fix: defib wall mount falls off when their mounted wall is destroyed
fix: floor lights are mounted to the ground/catwalk/tram floor they are
sitting on meaning destroying it will destroy the light
fix: wall mounted plaques now fall off when their mounted wall is
destroyed
/🆑
2025-12-12 12:23:22 -05:00
RikuTheKiller be1f231869 Lock R&D console boards by default (#94114)
## About The Pull Request

This PR makes all R&D console boards that are either printed or sourced
from tech storage start out locked. They can be unlocked by swiping them
with an ID that has research access.

R&D consoles can also be unlocked with an emag, but doing so will break
their comms circuit as well, making all researched nodes broadcast over
public comms. You can still emag the console itself after it's been
constructed without breaking it in any way, while also silencing
announcements instead. (that's definitely a noob trap, but it's out of
scope for this PR)

The reason why the tech storage board is locked as well is because the
goal of this PR is to stop engineers from making R&D consoles, and
engineers have access to tech storage. Leaving the board unlocked and
moving it to secure tech storage would make engineers break in there
every shift.

The changelog basically has a FAQ for "Okay, so what do I do instead?",
because I know people will be confused about what route they're intended
to take when science closes their desk shutters for the umpteenth time
this week.
## Why It's Good For The Game

Engineering has a habit of making an R&D console every round to bypass
having to ask science or a head of staff to research things. Locking the
consoles at least makes engineers consider asking science to do
science's job.

Note that this doesn't solve the issue entirely, it just removes the
easiest and most convenient way of bypassing science. Engineers can
still break into R&D extremely easily using their wire knowledge, and do
so regularly.

More importantly though, this might shine some light on the fact that
heads of department like the CE have remote access to the research
network via their PDAs. This means engineers can ask the CE to research
things for them.

Asking people with access to the research network to research things is
a lot better for roleplay and immersion than having engineering
construct R&D consoles every shift.

## Changelog
🆑
balance: R&D console boards sourced from printing or tech storage are
now locked by default. It's recommended to ask your respective head of
department or the science department to complete research for you. Heads
of department can remotely access the research network using their PDAs.
/🆑
2025-12-05 19:12:22 -05:00
Yobrocharlie c83a070266 First new gateway in a year. (#93894)
## About The Pull Request

This PR adds a new gateway with not too much threat a, a little bit of
reward more often in the form of gimmicky items or armor.

credit to https://github.com/NovaSector/NovaSector/pull/4880
For the gun and sfx sprite
## Why It's Good For The Game

The gateway system is about as decrepit and old, the last gateway that
was added was the museum which was made by somebody who would short
after receive a rule 8 ban and plus that away mission is a neat scenery
and has a lot of cool locations to look at but it has no loot, and you
know what? that's okay and it achieves what it sets out to do
beautifully, but if we discount that one for that reason alone (which
for the record is a bad reason to discount something) then the last
gateway that was added and that stuck was added in 2018? and it was
snowdin? I dont actually know, correct me on this. But basically, more
content good.

## Changelog

<details>
<summary>Screenshots/Videos</summary>
<img width="862" height="431" alt="image"
src="https://github.com/user-attachments/assets/d56add04-4b8c-4cd0-be7f-36d895e43868"
/>
<img width="654" height="665" alt="image"
src="https://github.com/user-attachments/assets/1ccd15c4-5c31-4b00-b5f8-9a662efa3436"
/>
<img width="651" height="571" alt="image"
src="https://github.com/user-attachments/assets/08ab4c1d-d9d0-413c-bc02-a3c51eda8761"
/>
<img width="1177" height="172" alt="image"
src="https://github.com/user-attachments/assets/8df5e28d-5041-4676-8370-b8ab351f5b52"
/>
<img width="850" height="586" alt="image"
src="https://github.com/user-attachments/assets/c03e6cbe-b290-421e-bbed-80a203221de4"
/>
<img width="1248" height="912" alt="image"
src="https://github.com/user-attachments/assets/aa3c415d-52de-46b9-b317-e397b481b1b7"
/>
<img width="885" height="697" alt="image"
src="https://github.com/user-attachments/assets/dd96d364-deae-4c56-9fc1-68b5e738ef4a"
/>
<img width="1284" height="646" alt="image"
src="https://github.com/user-attachments/assets/b433f591-d92f-4bea-921c-b231fce2e7d9"
/>

also NO you cannot make the sm sword using the slow recharge shrink ray
<img width="621" height="240" alt="image"
src="https://github.com/user-attachments/assets/75f7d235-33c2-424e-9260-a3cc8c931ab9"
/>
</details>

<details>
<summary>Documentation of all notable loot 11/8/2025</summary>
  /obj/item/clothing/shoes/gunboots/disabler
/obj/item/gun/energy/shrink_ray/one_shot (A shrink way that has a long
recharge time and can only shoot once)
  /obj/item/slimepotion/lovepotion x 2
  /obj/item/slimepotion/genderchange x 1
  /obj/item/slimepotion/slime/mutator
  /obj/item/gun/energy/disabler/smoothbore
  /obj/item/gun/energy/alien/zeta
  /obj/item/gun/magic/midas_hand
/obj/item/autosurgeon/xeno (A autosurgeon that only allows xenomorph
organs, here because it looks unique)
  /obj/item/organ/heart/gland (abductor organs, random.)
  /obj/item/organ/eyes/corrupt
  /obj/item/organ/appendix/corrupt
  /obj/item/clothing/suit/utility/radiation/cbrnsuit x 2
  /obj/item/clothing/head/utility/radiation/cbrnhood x 2
  /obj/item/clothing/gloves/combat x 4
  /obj/item/clothing/shoes/combat/swat x 2
  /obj/item/clothing/mask/gas/atmos/glass x 2 

/obj/item/clothing/under/rank/engineering/atmospheric_technician/nova/utility/advanced
  /obj/item/gun/ballistic/automatic/wt550/p90 x 2
  /obj/item/ammo_box/magazine/p90_mag x 14
  /obj/item/gun/energy/modular_laser_rifle/carbine x 2
  /obj/effect/spawner/random/armory/laser_gun
  /obj/item/grenade/c4 x 3
/obj/machinery/deployable_turret/hmg x 3 (you think these are good, but
they're not, they are really not, they're only good if you hit somebody
with them when they're not expecting it, otherwise people will simply
just avoid it, or if your being defensive of an area this thing will
have you just be a beast.)
/obj/machinery/mounted_machine_gun x 8 (But with no ammo, so theyre only
setpieces, okay well there IS ammo on the map but its anchored, and
theres no way to unanchor anchored items, if fallout thirteen players
cant do it over the course of 4 years then tg players sure cant.)
  
Also hello there it looks like you actually read this section, if you
have dont worry, this PR wont get merged, why? I dont want to salt about
that here.
</details>

🆑
map: added the "heretic" gateway map (it has nothing related to
heretics)
/🆑
2025-12-03 01:04:49 +00:00
SyncIt21 2424103245 Replacing objects with their mapping directional helpers Part 2 (#94181)
## About The Pull Request
Continuation of #94059. Replaces the following signs with their
directional helpers

- `/obj/structure/sign/warning ->
/obj/structure/sign/warning/directional`
- `/obj/structure/sign/warning/radiation ->
/obj/structure/sign/warning/radiation/directional`
- `/obj/structure/sign/warning/secure_area ->
/obj/structure/sign/warning/secure_area/directional`

Depends on #94076 for diagonal wall mounts

## Changelog
🆑
qol: added mapping directional helper for warning, radiation & secure
area sign allowing them to interact with fire/acid on their mounted turf
qol: adds mapping helper to create diagonally shifted objects
/🆑
2025-12-02 23:46:53 +00:00
SyncIt21 f7bc204bf7 Replacing objects with their mapping directional helpers Part 1 (#94059)
## About The Pull Request
Improving upon #93662 where i noticed a lot of objects don't have
directional helpers

Replaces the following mapped in objects with their directional
counterpart

- `/obj/structure/sign/nanotrasen ->
/obj/structure/sign/nanotrasen/directional`

less var edits & also more realistic interaction with fire/acid etc if
the turf on which they are placed on is attacked which isn't the case if
they are directly mounted on walls

## Changelog
🆑
qol: adds mapping directional helper for nanotrasen sign & replaces all
var edited instances
/🆑
2025-12-02 23:44:30 +00:00
SyncIt21 39a196824a Enhances algorithm for finding an atom mount (#94076)
## About The Pull Request
Depends on #94064 for the unit test but offers a better method for
finding an atom to mount on
- Finding a mount now takes into consideration the objects pixel x & y
offsets meaning diagonal mounting is now supported. Gives great
flexibility for mappers
- If you don't want to use pixel offsets but default back to using the
objects direction that behaviour is still preserved. Useful if your
object uses directional icon states(lights & cameras for now) AND don't
use offsets
- If no direction could be specified then as the last resort it defaults
back to the objects local turf for mounting

## Changelog
🆑
fix: all mounted objects on tables, fences, windows & walls should fall
of correctly when the atom it is placed on is destroyed
fix: security telescreen now falls off when their mounted wall is
destroyed
fix: defib wall mount falls off when their mounted wall is destroyed
fix: floor lights are mounted to the ground/catwalk/tram floor they are
sitting on meaning destroying it will destroy the light
fix: wall mounted plaques now fall off when their mounted wall is
destroyed
/🆑
2025-12-01 00:50:16 +01:00
nevimer fc2c3d826e Reset Maps to TGstation 2025-11-29 22:51:11 -05:00
nevimer baf3837ae8 Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx
2025-11-29 22:49:21 -05:00
necromanceranne d76d2f5438 Laser Gun Update: Deep Lore, Gun Variety, Pew Pew (#93520)
## About The Pull Request

Updates the laser gun into four proper subtypes: Standard, Pistol, Rifle
and Carbine.

<img width="229" height="210" alt="image"
src="https://github.com/user-attachments/assets/12c03076-8ebf-4d87-8c98-6a8cce6821db"
/>

Current sprites are pending a palette change.

**Standard:** Functions as you would expect. Same as ever.

**Pistol**: Lower charge, 20 force, normal sized, recharges faster.

**Carbine**: 15 force, 26 mag, two round burst. Projectiles flight
slightly faster. Cannot dual-wield.

**Rifle**: 20 force. 40 mag. Two round burst. EMP resistant (not
immune). Projectiles fly slightly faster. Cannot dual-wield (not that
you need to).

All but the rifle can be sourced from cargo. You can also buy the sovl
version of the laser gun if you're especially nostalgic.

### Armory Changes

The Armory now can potentially spawn either pistols, carbines or
standard. The weighting leans closer to spawning carbines and standard
as opposed to pistols.

### Lore Dump

The laser line of weapons now all have lore. That rich, deep lore that
every game needs and is totally not important at all to the meat and
potatoes of the game. I'm paid by the hour ($0.00)

### Code Tidying

Lasers are old and a total mess code-wise so we've tidied up while we're
here.

## Why It's Good For The Game

Variety is the spice of life and also some of these weapons could have
used a face lift. Especially the laser carbine. Both functionaltiy wise
and appearance wise.

A bit of randomness in the armory means some rounds might have unique
outcomes compared to others. Sometimes, items in cargo don't see
particularly much use, so peppering in a few random potential deviations
can maybe nudge people to utilize variant gear on future rounds.

I'm obsessed with writing too much information. I blame Hatterhat.

## Changelog
🆑
add: Three variants of the laser gun; Carbine (replacing the existing
one), Pistol and Rifle! Find it (possibly) in your armory today!
balance: The armory laser guns might be different variants of the laser
gun, rather than always being the standard. The standard is the same as
ever, even if it looks different.
add: If you care, the sovl version is available as a goodie. And in the
hands of pirates...
spellcheck: Lore! LORE FOR LASER GUNS! LOOOORE! Examine laser guns
closely and you might learn more about them.
balance: The new set of laser guns come with brand new sprites.
/🆑

---------

Co-authored-by: StaringGasMask <62149527+Exester509@users.noreply.github.com>
2025-11-20 22:21:16 -05:00
SyncIt21 81427cd5cf Unit tests, refactor & realignment for map loaded wall mounts (#93662)
## About The Pull Request
This 1st has to be PR'd so the integration tests can point out all
wallmounts that could not find a support structure to mount on. I then
will do many map edits to align them onto the closest atom

Yes we no longer use wall mount but atom mounted component. All objects
that are mounted on windows/tables & fences now also fall off when
destroyed

It'll probably be a WHILE before I can fix all wall mounts. Long day.
Expect me to misalign many stuff to fix failing CI so make sure to
provide suggestions when possible

Improved wallmount code overall
- Fixes #93793


## Changelog
🆑
fix: fixes all incorrectly maploded wall mounts that aren't actually
hanging on any support structure
fix: objects mounted on tables, windows & fences also fall off now when
destoryed
qol: lights can be mounted on windows
qol: cameras can be mounted on windows
qol: buttons can be mounted on tables
refactor: improved how wall mounts interact with objects as a whole
report bugs on github
/🆑
2025-11-18 22:37:12 -07:00