Commit Graph

32 Commits

Author SHA1 Message Date
SkyratBot
7cf7be4b7b [MIRROR] Tram v6/Transport Subsystem [MDB IGNORE] (#24399)
* Tram v6/Transport Subsystem

* Update icon_smoothing.dm

* Update utility.dm

* defines/icon

* Update airlock.dm

* Update door.dm

* Update airlock.dm

* Update airlock.dm

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-10-17 15:16:46 -07:00
SkyratBot
068089fb52 [MIRROR] Standardize Welder Fuel Usage [MDB IGNORE] (#21943)
* Standardize Welder Fuel Usage (#76021)

Remove welder fuel usage from all actions except attacking and leaving
it on
most welder tasks require a minimum of 1u of fuel, some longer tasks
require a minimum of 2 or 3u welders now drain 1u every 5 seconds
they're active
## About The Pull Request
Prior to this PR welder fuel usage was random, a lot of tasks didn't use
any welder fuel and welders were basically near infinite so long as you
didn't use them for combat, it took 26 seconds of activity to drain 1u
of fuel, that means an emergency welder alone could run for 5 minutes
straight before needing a refuel

After this PR all welders will drain 1u every 5 seconds instead of every
26 seconds, but welding objects won't require extra fuel anymore, making
the fuel usage much more consistent.

resolves #55018
## Why It's Good For The Game
Actually makes fuel tanks useful and relevant without making it
obnoxious to do repetitive quick tasks like turn rods into plates,
there's actually a reason to upgrade off the emergency welder now since
it lasts 50 seconds rather than 5 minutes
## Changelog
🆑
qol: Welders now have a more consistent fuel usage
/🆑

* Standardize Welder Fuel Usage

---------

Co-authored-by: Couls <coul422@gmail.com>
2023-06-20 09:39:49 -07:00
SkyratBot
c4d4e1da63 [MIRROR] Minerals have been refactored so costs and minerals in items are now in terms of mineral defines. [MDB IGNORE] (#20916)
* Minerals have been refactored so costs and minerals in items are now in terms of mineral defines.

* AI GEN RUN ONE

---------

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-05-03 22:48:10 +01:00
SkyratBot
05a56c79c4 [MIRROR] Removal of Kilostation [MDB IGNORE] (#20854)
* Removal of Kilostation (#75039)

## About The Pull Request
Removes Kilostation from the game.
Since I know this is bound to be a touchy subject (the map has its fans,
after all), I feel I need to explain the situation and why this decision
has been made.

While working on mapping for TGStation, there's an inherent struggle
between what's good for mappers, and what's good for coders. On the
mapping side, we want as many maps as we reasonably can have in the
repo. On the code side, every map added introduces a new layer of
complexity for adding new features. While we're attempting to make
strides in improving cooperation between the two teams so we can handle
both many maps and lots of new features, in the here and now this means
that we find ourselves limited in how many maps we can maintain at once.

With this in mind, we find ourselves in a conundrum when new maps come
along. While it would be nice to accept everything new without needing
to remove anything else, the above problems force us to stick to a
limit. Via a fair amount of discussion on the maintainer team, this was
set to 6 recently, which we reached when Northstar was merged, and
meaning that a removal was required for any new maps.

As for why the decision was made to take Birdshot over Kilo, I believe
it is better for us to have a map that has room to grow and an active
creator. As much as I was personally a Kilo enjoyer, the map has
consistently proven to be problematic for new code additions due to its
scale, and it receives little maintenance outside of the bare essentials
as a result. With all this in mind, it comes out as the obvious choice
for removal in this case. Of course, nothing stops it from coming back
in future if any of the above changes.
## Why It's Good For The Game
TL:DR: In order to keep the maintenance budget down, we need to remove a
map for the sake of new blood, and in this case Kilo was the simplest
choice.
## Changelog
🆑
del: Kilostation has went back to its home planet. It served us
faithfully for nearly 3 and a half years. May it rest in peace.
/🆑

---------

Co-authored-by: tattle <66640614+dragomagol@ users.noreply.github.com>

* Removal of Kilostation

---------

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: tattle <66640614+dragomagol@ users.noreply.github.com>
2023-05-03 01:35:07 +01:00
SkyratBot
db37525763 [MIRROR] North Star Merge Plaque and Requests Console for QM [NO GBP] [MDB IGNORE] (#20605)
* North Star Merge Plaque and Requests Console for QM [NO GBP] (#74712)

* North Star Merge Plaque and Requests Console for QM [NO GBP]

---------

Co-authored-by: Cheshify <73589390+Cheshify@users.noreply.github.com>
2023-04-16 23:58:30 +01:00
SkyratBot
e895d0f98c [MIRROR] Tram signal defines, subtypes, documentation, compound damage calc [NO GBP] [MDB IGNORE] (#19313)
Tram signal defines, subtypes, documentation, compound damage calc [NO GBP]

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2023-02-14 11:12:27 -05:00
SkyratBot
1c93bd94e1 [MIRROR] Sign/plaque contextual screentips and file reorganizing [MDB IGNORE] (#19227)
* Sign/plaque contextual screentips and file reorganizing (#73246)

## About The Pull Request

This PR adds contextual screen tips to signs and plaques based on the
held tool. Wrenches unfasten, and welders repair. Behaves the same with
plaques, but plaques also get a screentip for using a fountain pen on
them if they can be engraved. Also adds a tip to editable-item signs
with a pen out.
Tested to avoid issues with posters from cropping up, and it appears to
still behave correctly with paper posters, which are apparently a type
of sign. Go figure.

![image](https://user-images.githubusercontent.com/41715314/216807994-c2400fa0-77fa-48e9-8c2e-5c5ea660a1d8.png)

I've also reorganized the sign and plaque files to follow our more
standard object hierarchy of base type -> inherited procs -> subtype
specific procs, where these were interspersed throughout the file. I did
however leave the armor datums below the object, as they appear to
follow new convention.

## Why It's Good For The Game

Screentips avoid ambiguity and improve readability of construction. Easy
improvement.

Plus, improves consistency of the signs file layout-wise.

## Changelog

🆑
qol: Adds screentips to both signs and plaque construction/modification.
/🆑

* Sign/plaque contextual screentips and file reorganizing

---------

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2023-02-08 02:16:26 +00:00
lessthanthree
2127d305b3 [MANUAL MIRROR] Tram Mk. IV (#19131)
Tram Mk. IV (#73057)

- After one too many tram malfunctions, Nanotrasen's insurance provider
finally sprung the cash for a new tram. Made with the latest in
lightweight materials, there's more capacity than ever before to shuttle
your crew around the station.

https://user-images.githubusercontent.com/83487515/215639768-3f7fcb84-cfd2-4efe-b578-998197651f13.mp4

- Consolidates all the tram turfs, objs, and structures into respective
.dm files because they were haphazardly spread everywhere.
- Fixes tram doors playing open/close animations when they're already in
the correct state, corrects timing for when they change density.
- Tram now correctly has an operating status and will stop functioning
when power is lost.
- Call buttons no longer dispatch a tram that doesn't have power.
- Fix for emergency exit when tram has no power.
- Running at closing tram doors is a gamble, you may be crushed
- Fixes https://github.com/tgstation/tgstation/issues/73125

Looks nice, more space, tram doors demand a pound of flesh.
🆑 LT3
imageadd: Nanotrasen's insurance provider finally sprung the cash for a
new tram. Made with the latest in lightweight and mostly* non-flammable
materials, travel in comfort and style!
code: All tram components are now organised based on type
code: Tram is now aware if it has power or not
del: Removed movement slowdown running on tram plates
fix: Tram call buttons will not work calling an unpowered tram
fix: Tram doors will no longer cycle open/closed when they're already in
the correct position
fix: Fixed an edge case where running onto the tram you bounce off the
open door as if it was closed
fix: Unpowered tram doors can only be forced into the open position
fix: Westbound travel shows the correct controls animation
add: Tram doors take a chunk of flesh if you run at them last minute
qol: Reduced duration of amber stage on tram crossing signals
/🆑
2023-02-03 15:55:39 +00:00
SkyratBot
92a3f862ef [MIRROR] Layering: Fixes wires and pipes on lattice catwalk, glass floor [NO GBP] [MDB IGNORE] (#18930)
Layering: Fixes wires and pipes on lattice catwalk, glass floor [NO GBP] (#72703)

## About The Pull Request
- Fixes https://github.com/tgstation/tgstation/issues/72894
- Fixes layering for wiring and disposal pipes on lattice-based catwalk.
(Goes on top.) Wiring and pipes on floor-based catwalk. (Goes
underneath.)
- Glass floor shifted to show wires/pipe underneath it.
- Moves tram plaque to the game plane, layered underneath tossed
objects.
## Why It's Good For The Game
Wiring the solars looks weird with the wrong layering.
## Changelog
🆑 LT3
fix: Wires and pipes again rest on top of lattice catwalk
/🆑

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-01-24 14:31:46 -08:00
SkyratBot
85b56a310d [MIRROR] Fix JSON description for solo bench and tram [NO GBP] [MDB IGNORE] (#18661) 2023-01-12 13:58:59 -08:00
lessthanthree
280460bab8 [MANUAL MIRROR] [NO GBP] Side mounted tram controls (#18636)
* Side mounted tram controls (#72193)

Continuation of https://github.com/tgstation/tgstation/pull/72047 this
part was left out until it could be done using directional map helpers.
- Side mounts the tram controls freeing up the middle space for
shenanigans or whatever, and you can hit the controls faster from either
side of the tram.
- Emergency exit feature, doors can be forced open when the tram has
lost power.
- Accessible spots for wheelchairs (Ian's injured, you know!)

![image](https://user-images.githubusercontent.com/83487515/210920404-150f394b-4263-45d4-82ef-12eda0cfedb7.png)

- Looks like a tram direction sign instead of an awkward center placed
computer. Build an ice cream or illicit drugs shop or something in the
middle. Frees up space.
- You don't get stuck on an unpowered tram if you don't have a crowbar.
🆑 LT3
imageadd: Tram controls are now side mounted, freeing up space. Even
better, you now have two of them!
imageadd: Added a new accessible space on the tram for wheelchairs
fix: Removed duplicate tram plate/platforms
code: Tram has its own floor subtype for the walls and windows
add: Emergency exit feature added for people who are silly enough to not
carry a crowbar
/🆑

* floors.dmi
2023-01-11 08:14:12 -08:00
SkyratBot
011fefdd81 [MIRROR] Refactors armor into dedicated subtypes [MDB IGNORE] (#18291)
* Refactors armor into dedicated subtypes

* start

* most tg things

* pain (#18584)

* shit

* non-mod changes

* compile

Co-authored-by: John Doe <gamingskeleton3@gmail.com>

* #18291

* compile fix

* ???

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2023-01-07 20:06:16 -08:00
SkyratBot
1b7f17f107 [MIRROR] [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1) [MDB IGNORE] (#15801)
* [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1)

* Fixes all the conflicts and all of our modular files using core icon files with broken paths

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-28 15:11:04 -04:00
SkyratBot
5dd90efbce [MIRROR] Icebox Murals: AI Upload and RD Office [MDB IGNORE] (#14869) 2022-07-12 05:55:29 -04:00
SkyratBot
4c0f5060d2 [MIRROR] MULTI-Z IceBoxStation Locker Room (Laundromat Diplomat) [MDB IGNORE] (#10793)
* MULTI-Z IceBoxStation Locker Room (Laundromat Diplomat) (#64055)

* MULTI-Z IceBoxStation Locker Room (Laundromat Diplomat)

Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
2022-01-18 14:58:13 +00:00
SkyratBot
092e534e75 [MIRROR] TGUI list conversions + bug fixes [MDB IGNORE] (#10355)
* TGUI list conversions + bug fixes

* Fixing conflicts

* Maintaining a few modular files while we're at it...

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-01-03 22:53:58 +00:00
SkyratBot
e90627be0e [MIRROR] Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed [MDB IGNORE] (#9176)
* Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed

* Fixing conflicts

* Makes it compile, yeet all the RAD armor from everywhere (thanks RegEx!)

* Removing more lingering rad armor (woo)

* Damnit powerarmors

* Bye bye rad collectors!

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-02 10:36:46 -04:00
SkyratBot
1bedcb0714 [MIRROR] The monkey portrait decoration is now a set of random pictures that also act as persistent photo frames. Every station map gets one. [MDB IGNORE] (#8681)
* The monkey portrait decoration is now a set of random pictures that also act as persistent photo frames. Every station map gets one.

* mirrors changes

* Update mothership_astrum.dmm

* Update BlueShift.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-10-14 06:43:45 +01:00
SkyratBot
04302a770a [MIRROR] moves obj_integrity and associated procs to the atom level (#8016)
* moves obj_integrity and associated procs to the atom level

* Feex good

* Whoops forgot the maps

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-10 16:47:01 +01:00
SkyratBot
c0d3bcce69 [MIRROR] sets commission plaques to below open door layer (#6710)
* Set commission plaques to below open door layer (#59984)

it looks bad when you drop an item

* sets commission plaques to below open door layer

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-07-04 22:15:00 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
fbb78302cf [MIRROR] Makes obj_integrity private and only updated through procs (#6125)
* Makes obj_integrity only updated through procs (#59474)

Having things updating integrity directly is just going to cause more problems down the line as more elements and components depend on being notified of integrity changes. It's an easy mistake to make so making it private should deal with the problem.

get_integrity() might be useful in the future but is mainly a side effect of making obj_integrity private as that also disallows reads.

* Makes obj_integrity private and only updated through procs

* Mirror!

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-05 16:35:09 +12:00
SkyratBot
ced3c57096 [MIRROR] Commission Plaques (#5611)
* Commission Plaques (#58995)

Adds commission plaques- these commemorate the day a station was added to the game (adjusted for SS13 time) and the day it was removed (in the case of removed stations). If I got any of the dates wrong, please feel free to tell me.

They're added to every in rotation station, as well as the Derelict and Runtime Station.

Many thanks to Fikou for providing the git hashes for each commit to add/remove a station:

It's a neat nod to the maps' OOC history, as well as simply being some nice flavour.

* Commission Plaques

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2021-05-12 04:10:37 +01:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
3bd294f26f [MIRROR] Defines damage flags. (Hopefully without 50+ commits) (#491)
* Defines damage flags. (#53158)

* Defines damage flags. (Hopefully without 50+ commits)

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-08-24 22:52:31 +02:00
SkyratBot
b5ce584906 [MIRROR] Allows blind people to touch things to examine them (#231)
* Merge pull request #52727 from MrMelbert/touchyfeely

Allows blind people to touch things to examine them

* Allows blind people to touch things to examine them

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2020-08-07 11:08:02 +02:00
LemonInTheDark
f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
uomo
7a31f65220 Some more fixes for signs and related stuff. (#50752)
* inhand icons

* Adding to the object, forgot to name one icon.

* Fixing some stuff, and creating inhand icons.

* Fixes a thing I broke.

* Fixes things (including ALL posters) that shouldn't be wrenchable being wrenchable. Plaques now transfer icon_state always.

* Picture frames, painting frames, and the monkey portrait are now wooden.

* Fountain pens can now be uncommonly found in maint.

* Uneditable sign types should not become editable when unwrenched.

* Move redefined var above newly defined var.
2020-05-01 21:52:36 -03:00
uomo
d5451ae60a Department, warning, and general sign code fix. And brand new custom plaques! (#50550)
* Oh God I hope this works...

* It didn't work.

* Making things better.

* Making things even better.

* That made things worse.

* Sorting works! \o/

* Tidying some thing ups.

* Adding a custom plaque to the game.

* Some plaque tweaks.

* Makes plaques more durable than signs.

* Adds the stack crafting.

* Plaques take a little time to engrave, signs can't be changed instantly anymore.

* Comments, and renamed the global list to avoid confusion.

* Appends "sign" to every name, makes department signs not all caps, fixes some names and descriptions.

* Touching up plaque customization and display, removing one last all caps.

* Plaques can now be engraved in hand too.

* Newline.

* Update code/game/objects/structures/customplaque.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/objects/structures/customplaque.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Mirroring some fixes from customplaque.dm

* A bunch of stuff.

* Unwrenched signs now lay horizontal.

* A lot more stuff, turned a negative variable into a positive.

* Fix chat inconsistency, remove deprecated and unused variable.

* Apparently buildable_sign is used elsewhere, whoops.

* Adding documentation to this, fixing a bool being 0 in another file.

* Don't know why this was here, sign dir is 100% irrelevant.

* Fixes some sound malarkey.

* Changes delays to be readable, removes unneeded return.

* Fixes these two early returns, it needed return TRUE at the end to work.

* Trying to fix a revert I messed up...

* Moving plaques to a directory, moving old sign plaque types into it. Map changes.

* Rename since I relocated this object entirely.

* Signs (and plaques) now properly place, and aren't visible through walls.

* Comment to help people in the future.

* Signs and plaques can be placed diagonally now.

* Removes duplicated code line.

* Blank signs now commonly spawn in maint, blank plaques uncommonly.

* Repairing signs & plaques with a welder is now good to go.

* Moves the GLOB, makes it start as an empty list.

* Update code/game/objects/structures/plaques/_plaques.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Gets rid of some oldcode.

* Apply suggestions from code review

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* Simplifying dir switch to two if elses.

* Plaques take one sheet of gold to graft instead of five.

* Just making this wording in crafting a little clearer.

* They can be removed with wrenches, so I don't think this is proper.

* Makes variables descriptive.

* More descriptive variables, a little dmdoc, move things around to be next to like things.

* Remove a redundant definition.

* Apply suggestions from code review

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Fixes mapping path, rename sign_backing to just sign.

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2020-04-28 01:43:44 -03:00