Commit Graph

58 Commits

Author SHA1 Message Date
SkyratBot
cd40957a79 [MIRROR] Split mining.dmi [MDB IGNORE] (#15836)
* Split mining.dmi (#69442)

* split mining.dm

* Remove a pair of unused icons

* From merge conflict

Co-authored-by: tattle <article.disaster@ gmail.com>

* Split mining.dmi

* Also fixes Gibtonite in the same PR.

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-28 15:50:27 -04: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
687f1c266f [MIRROR] Adds new signage for the AI upload, AI sattelite, telecomms, vault, and R&D Servers [MDB IGNORE] (#15088) 2022-07-23 18:15:41 -04:00
SkyratBot
a09cf3d7a4 [MIRROR] Poster Pack 2 - Beyond Posters [MDB IGNORE] (#14879)
* Poster Pack 2 - Beyond Posters (#68235)

Adds a new selection of posters, poster-like objects, and wall decorations.

New entirely with this PR, shipping containers! These sprites were adapted from a base from TGMC, with brands and designs more fitting to our universe here on TG

Another new addition, flags! These draw upon Common Core lore, representing several major factions from the lorebase as a new mapping tool

Finally, there are two interactive wall objects- wall clocks, and calendars:

The wall clock shows both the "real time", represented as the Earth time, or Treaty Coordinated Standard Time, and the station time, represented as the local time, or Coalition Standard Time

The calendar gives the in-universe date, as well as any active holidays

Why It's Good For The Game

This adds a lot of fun aesthetic additions that I think will benefit our mapping team in creating new spaces and breathing new life into older ones. Additionally, it helps make our Common Core lore a bit more tangible to the playerbase, bringing it away from being "just on a wiki" and into the game proper.

A whole host of new posters have just become available.
For the architects among you: a number of new aesthetic options are available for mapping with. Let your creativity free!

* Poster Pack 2 - Beyond Posters

* add to dumb modular file

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-07-18 16:13:02 +00:00
SkyratBot
40d8cefa37 [MIRROR] Mining Outpost Overhaul: Island Living Edition [MDB IGNORE] (#14880) 2022-07-12 19:18:42 -04:00
SkyratBot
1262ac129e [MIRROR] Patches Rad_Area Directional Sign Helpers [MDB IGNORE] (#14518)
* Patches Rad_Area Directional Sign Helpers (#67945)

Patches Rad_Area Directional Sign

Hey there,

I was trying to do something much more ambitious, but that completely fell through. I did catch this little mistake that caused this to occur though:

This PR just makes it the correct pathing for the directional helpers.

* Patches Rad_Area Directional Sign Helpers

Co-authored-by: san7890 <the@san7890.com>
2022-06-25 22:18:13 +01:00
SkyratBot
1cd67be040 [MIRROR] [MDB Ignore] Mapping directional helpers for signs + sign naming conventions [MDB IGNORE] (#13503)
* [MDB Ignore] Mapping directional helpers for signs + sign naming conventions

* wew

* wew

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-11 02:06:15 +01:00
SkyratBot
3efeb0bd4e Replaces all "Space" warning posters with "Cold" and "Gas Mask" posters on IceBox (#12661)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-11 01:22:00 +01:00
SkyratBot
1c9f630649 [MIRROR] DeltaStation's Recreation Area Rework, (LUNG CANCER EDITION) [MDB IGNORE] (#12281)
* DeltaStation's Recreation Area Rework,  (LUNG CANCER EDITION) (#65588)

* DeltaStation's Recreation Area Rework,  (LUNG CANCER EDITION)

Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
2022-03-26 01:08:18 +00:00
SkyratBot
f5ff946035 Tramstation Dorm Rework (#11928)
Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-03-13 21:53:34 +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
fa519bdde3 [MIRROR] cleanup _HELPERS/_lists.dm and all the necessary files [MDB IGNORE] (#8783)
* cleanup _HELPERS/_lists.dm and all the necessary files

* Epbic

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-13 21:07:35 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +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
9f7d93f3f3 [MIRROR] Remove nanites (#7210)
* Remove nanites

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-29 00:45:17 +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
730ea000df [MIRROR] Gives the monkey a gun (#5543)
* Gives the monkey a gun (#58565)

This adds a rare-ish negative station trait that gives Pun Pun a weapon, fills their heart with anger, and bloodies up the location they spawn in. (Yes the weapon is even more rarely a gun)

A request for one of the weapons to be a sign meant that a random sign type was added here as well.

* Gives the monkey a gun

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-05-08 16:32:03 +01:00
SkyratBot
84f6558402 [MIRROR] Tramstation: choo choo MORE MAP COMIN' THROUH (#4083)
* Tramstation: choo choo MORE MAP COMIN' THROUH

* Tramstation: Skyrat Edition (#4104)

* Decals Fixed

* Modularity? Whatever

* Fuck me if I need to make a second PR for this

* Blueshield + Cryo + Ian Fursuit

* Automatic changelog generation for PR #4104 [ci skip]

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Cheshify <73589390+Cheshify@users.noreply.github.com>
2021-03-12 23:19:38 +00: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
75894a2d0d [MIRROR] Fix some miscellaneous grammar mistakes (#656)
* Fix some miscellaneous grammar mistakes (#53414)

* Fix some miscellaneous grammar mistakes

Co-authored-by: Tad Hardesty <tad@platymuus.com>
2020-09-06 05:53:09 +02: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
72c69368b6 [MIRROR] Opacity refactor (#405)
* Opacity refactor (#52881)

    Moves all opacity var manipulation to a proc which sends a signal.
    light_blocker element for movable opaque atoms made, which tracks its movement and updates the affected turfs for proper lighting updates.
    has_opaque_atom boolean replaced by the opacity_sources lazylist to keep track of the sources, and a directional_opacity which serves a similar function but also allows for future expansion with on-border opaque objects (not yet implemented).
    Some opacity-related sight procs optimized as a result of this.
    Some variables moved to the object's definition.
    A define or two added into the mix for clarity.
    Some code cleaning, like turning booleans into their defines.
    One file renamed for clarity.

Changelog

cl
balance: Mechs no longer block sight. It's a non-trivial cost for the lighting system with little to no gain.
/cl

* Opacity refactor

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-19 04:48:14 +02:00
SkyratBot
f875f7c6ce [MIRROR] Lawyer and Courtroom department signs. (#263)
* Lawyer and Courtroom department signs. (#52753)

* Lawyer sign.

* Courtroom sign.

* Lawyer and Courtroom department signs.

Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com>
2020-08-10 23:16:07 +01: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
wesoda25
bad585e2e5 wow i have braindamage 2020-05-15 17:44:01 -04:00
s
bd966b991c xenoboksly 2020-05-15 16:44:07 -04:00
William Wallace
e007b3dcab reduce amount of lists that exist during runtime for custom materials (#50832) 2020-05-06 05:00:39 -07: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
spookydonut
8dbf1cf4ec Changes to comply with GitHub TOS
Further changes to comply with the ToS

More ToS cleanup

Bye bye George Melons

Better to be safe than sorry
2020-04-14 21:24:50 +00:00
uomo
f40f99dc64 Basic job code, access, spawn point landmark, area, department sign. 2020-03-13 23:27:23 -05:00
MMMiracles
f739e80649 Double-Decker Donut Disaster (Multi-Z Donutstation) (#48781)
* uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

* upper staircases, lots of upper floor work

* railings

* ai sat rework, exterior decals

* ass ass ASS ASS fuckin ASSSSS

* oh my god its full of stairs

* forgot a file oop

* railing fix on multiz test, upper atmos, external space dust deterrents

* both-way rail climbing, maint work, 2nd story atmos desk, pipe/wiring/ allow floating over openspace and moving up-down openspace in nograv, trailing ends

* go NORTHWESSSST

* maint work, hull work, gamer time

* upper security, more maint work, eva catwalks, less retarded railings, hiding signs from openspace, elevators suck, wire/pipe work

* more maint work, decal work on 1st floor, called my parents they appreciated it

* multiz test shit

* maint work, hallway work, botany work

* removed cloning, turned into general treatment, added small temp corpse storage next to treatment

* eduititititit

* gamers

* openspace fixes

* os over os fix

* prison rework, hallway work, pr prep

* mapmerge + remove pixel 0s

* bad area and more railings, newline

* unnecessary vis flags and unused computer console

* public mining dock

* oops lol

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-03-02 03:44:59 +08:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00
skoglol
17f86ca12a Merge pull request #48597 from spessbandit/examination
Clicking a sign examinates it.
2020-01-07 11:03:42 +01:00
spessbandit
1033a02f24 Clicking a sign examinates it. 2020-01-05 01:20:39 -05:00
MMMiracles
d664a89385 plumbing room, extra cameras, disposals fix, new department sign 2020-01-01 14:41:28 -05:00
ArcaneMusic
6e238392bf Adds several different uses for plastics (Cups, Utensils, Folding Chairs, Station Signs) (#47486)
* Initial PR, Cups, Utensils, Signs, Chairs

* Endline fixes for travis, adds plastic utensils to the initial node

* Makes bar invisible, addtimer added, fixes potential dmi/dm conflict

* Fixes Merge conflict take 2

* Wraps the chair snapping proc in invoke_async

* Cleans up Async Call a smidge
2019-11-02 20:30:35 +01:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
MMMiracles
353457f7d5 Donutstation Tweaks (#45250)
About The Pull Request

    Fixes #45077
    Fixes #42498
    Removes every single instance where a grille could end up on top an active wire in maintenance, making traveling maintenance a lot less of a hassle and less dangerous in general.
    Maintenance bar has been removed due to redundancy and closeness to the actual bar. Wait till season 10 of SS13: Battle Royale to find out what exciting changes will come to the map!
    Space-proof variants of the lizard critter has been added and are working diligently on the above-mentioned bullet-point.
    As part of the white shuttle fix, Donutstation now has a custom shuttle with deep l o r e to explain what happened to the long-past crew.
    Small adjustments to the static loot part of the 'excess storage' rooms near departments.
    Some extra crates has been added around maintenance with respective maintenance loot spawners.

Why It's Good For The Game

Bug fixes relating to the map and some added map content to keep things 'fresh'.
Changelog

cl MMMiracles
add: Donutstation now has its own white shuttle with proper dock.
del: Donutstation's maintenance bar is under renovation.
tweak: Due to above renovations, the goose is temporarily loose.
tweak: Donutstation now has significantly less annoying maintenance grilles
/cl
2019-07-19 23:11:57 +12:00
WJohn
6f959e7192 Slightly tweaks syndie lavaland/listening post bases. (#42913)
When the circuit lab was added and subsequently removed from the lavaland base, it left a poorly lit spot by medbay. Also adds explosive warnings in the test chamber to hopefully dissuade people from blowing the whole base up.
2019-02-26 21:39:51 -05:00
MrDoomBringer
e011cfe62b [RED LABEL][TESTED][SINGLE][READY][2][MINGLE] Adds an Supplypod Launch Bay specifically for ERTs or Deathsquads (#42614)
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* adds the room

* makes the boobs more seeable

* WHAT IS CONSISTENT PROC NAME FORMATTING FUCK FUCK FUCK

* adds fluff sign and fixes map a tiny bit

* small updates

* fuck FUCK YOUR MERGE CONFLICT FUCK
2019-02-14 21:12:55 +11:00
vuonojenmustaturska
a287380797 Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory (#40662)
* henk

* oh yeah this

* undo this meme

* stuff
2018-10-06 14:28:28 +02:00
ShizCalev
2fa1ac1349 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 03:10:31 +03:00