Browse Source

Tgupdate (#338)

* uplink fix

* Updates based on dunking element.

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

* Accidently bundled changes.

* Automatic changelog compile [ci skip]

* Remove spawn in favour of timers (#50562)

* Remove spawn in favour of timers

* aaaaaa

* Qdels

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

Co-authored-by: Rohesie <rohesie@gmail.com>

* toy toy toy (#50657)

shave a thou off the price


why not


update


hurng

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

* Adds a Syndicate version of the Cyborg Monitor program (#50691)

* Done and done

* drops a file

* re-add the file a little

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

* tgui: Better Canister (#50692)

* tgui: Better Canister

* Rebuild tgui

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

* Fixes Silver_spawned variable to work outside of luminescents.

* fixes the islamic calendar and adds more prefixes (#50695)

About The Pull Request

it is no longer the start and end of Ramadan at the same time
Why It's Good For The Game

fixies
Changelog

cl
add: more islamic prefixes
fix: end of ramadan now follows the islamic calendar
/cl

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

* Automatic changelog compile [ci skip]

* Fixes right pew name (#50683)

About The Pull Request

Fixes the right wooden pew end name
Why It's Good For The Game

discrepancy detected
Changelog

cl
fix: right pews are no longer left pews.
/cl

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

* remove redundant drillhair definition & give unshaven mohawk hair unique type-path (#50688)

About The Pull Request

I think these are the last duplicated var definitions in the codebase. There's just a couple of changes:

    The unshaven mohawk now has unique type-path from the shaven mohawk. This means that the shaven mohawk can be selected in character setup.

    "Drill Hair" and its associated icon have been removed. It's very similar to the Drillruru hair style and hasn't been available for a long time due to the Drillruru style using the same type-path.

This PR should not affect saves as the save system relies on the hair-styles' names rather than their type-paths.
Why It's Good For The Game

Cleaner code & a new hair-style that was meant to be available anyway.
Changelog

cl
add: Shaved Mohawk hair-style is now available
imagedel: deleted redundant "Drill Hair" icon
code: deleted redundant "Drill Hair" hair-style
/cl

Fixes #50629

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

* Adds the Airlock Authentication Override Card (#50636)

About The Pull Request

Cryptographic sequencers can no longer open airlocks
The Airlock Authentication Override Card can open airlocks (3 charges, each charge refills over the course of a couple minutes)
Why It's Good For The Game

@optimumtact said it was good for the game
The data says the emag is the most bought traitor item. This is because the emag has too much bloat. To help mitigate this this we've taken away airlock hacking from the emag, however instead of removing the feature outright (as in #50632) we move the feature to a new item, for those who really still want to be able to hack doors
Changelog

cl MrDoomBringer with some code stolen from itseasytosee
add: added the Airlock Authentication Override Card. Use it to open airlocks!
add: added Syndicate Jaws of Life to the nuke op uplink. Use it in it's crowbar configuration to open as many doors as you'd like!
del: The cryptographic sequencer can no longer open airlocks :(
/cl

Closes #50632

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

* 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>

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

* Nerfs the cybersun hardsuit and moves it out of the uplink (#50721)

* nerf

* nerf this

* description

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

* Automatic changelog compile [ci skip]

* Lizards say "ks" instead of "x" (#50698)

Added two more regex vars to lizard tongues.

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

* Automatic changelog compile, [ci skip]

* Removes krihelimeter from the README (#50738)

the project has been End of Lifed

* [READY] Basically, Instant Explosions 2: The Search For More Money: Eternal: A Tail Of Two Kitties: 33 1/3 (#50594)

About The Pull Request

Extools maptick stuff is in the game. Stolen from BeeStation/BeeStation-Hornet#1119, improves performance. Requires ex-tools on the server, though.

Explosions have been refactored to do the actual exploding in a subsystem.

Credit to goon.

Here's some videos!

Why It's Good For The Game
Basically instant max-caps now.
We can now give more of a tick over to the sending of map updates

Changelog

cl Goonstation Coders, Beestation, Extools devs
refactor: Explosions have been heavily optimized.
/cl

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

* change default pref for viewport fitting (#50749)

About The Pull Request

Changes the pref for fitting viewport to automatic. This not being the default has always confused me, and should resolve some teething issues widescreen is having.
Changelog

cl
tweak: Auto fit viewport is now the default, and everyone's setting for this has been reset to the default. If you don't know what this means, it's safe to ignore.
/cl

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

* Automatic changelog compile [ci skip]

* Fixed Typepath

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

* tgui: Tutorial fix (#50766)

About The Pull Request

Web edit kung-fu for a really dumb mistake in documentation, which makes copypasta not work, and confuses the hell out of newbs.

* cleans out my pastry mix (#50700)

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

* Canister frame helpers description fix (#50716)

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

* Remove kilo and donut maps (#50730)

About The Pull Request

Removes Kilo Station and Donut Station from the game
Why It's Good For The Game

Reduces burden on coders to add and maintain mapping related changes.
Honoring Map vote results.
Changelog

cl

del: Kilo Station decommissioned
del: Donut Station decommissioned

/cl

* Removes the compact combat shotgun 2: Electric Boogaloo (#50764)

* Removes the compact combat shotgun from the code.

* Removes the compact shotgun sprite

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

* Policy Config Clarifies To_Chat Is NOT Support of Policy Feature (#50660)

* Update POLICYCONFIG.md

* Update POLICYCONFIG.md

* contribution (#50664)

* fixes macrobombs (#50674)

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

* tgui: Find BYOND cache via Windows Registry (#50769)

* Foreigner Quirk, Adds Galactic Uncommon (#50701)

* Adds Foreigner Quirk

Blocks Galactic Common

* Exceptions for species without secondary languages.

Adds beachtongue for humans and felinids

* Adds Galactic Uncommon

* Adds uncommon include into the .dme

Gotta tick that box

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

* Automatic changelog compile, [ci skip]

* Adds a few more smites (#50689)

* Adds a few more smites

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* buffs_Pai_spawns (#50757)

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

* Small door and area fix.

* Changes ishuman to specify basic humans (#50787)

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

* Resprites for area icons (#50586)

Over the years we've accumulated a ton of mish-mashed and clashing area icons. This resprites (almost) every area icon to follow a standard text, design, and general department/section color. Also adds some new unique icons for areas that previously used basic area icons.

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

* Sorts quirks into medical record categories (#50647)

* Sorts quirks into medical record categories

Removes Allergens from med record, still need to squash a bug.

* Makes Rohesie's requested changes

* typo

* Replaces magic numbers with defines

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

* Automatic changelog compile, [ci skip]

* changes geneticist uplink item availability to rd instead of cmo (#50713)

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

* Fixes canister export runtime (#50727)

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

* Some minor cleanup around the verification system and jobexp (#50733)

Job exp now checks there is a living hours value, so as to avoid
returning a null unexpectedly.

Discord verification system now assumes you want at least 1 or more
hours of verification time, as it's value is limited otherwise

* Fixes med record population (#50794)

* Removes (!dat len) from for loops

* Removes an unnecessary space

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

* Fixes duplicate sec console in engi outpost.

* Meday's lobby disposal is now connected.

* fixing a few super small issues with usage of the & operator (#50780)

* fix some erroneous bit-band operations caused by operator precedence

* switch out & op for && op in medical mesh splitting

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

* fix message when plastic spoons/forks break (#50748)

* plastic spoons now break

* fix message when plastic spoon/fork breaks

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

* you can no longer privately pay for stuff with departmental budgets (#50754)

* you can no longer privately pay for stuff with departmental budgets

* ok kobby

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

* Rework logic due to ninja suits (#50728)

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

* Automatic changelog compile [ci skip]

* Hierophant no longer pierces all armor (#50802)

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

* Borgruntime

* [READY] Redesigns Metastation Perma with Box-Style Rooms (#50735)

* Ports Box Perma to Metastation

* Added some lights and decals that were missing.

* Fixes Camera Coverage, fixes hole under visitation

* Turns out I WAS missing something, prisoner spawners. A-okay now.

* Implements suggestion to change airlocks. Isolation room therapy plush

* Fixes C_Tags, Removes some windows

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

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

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

* Makes stasis bed room a little less cramped.

* Adds placeholder medical records computers, more IV drips.

* Ports tables from Sunset Station (Sprites are credited to Quantum-M) (#50753)

* Port

A bunch of tables from sunset

* thanks floyd

* zoo-wee mama

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

* chumbis changes (#50778)

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

* FUCK

* notice your indents kids

* Removes redundant intercom.

* fixes the targeting of the cortex bioware surgeries (#50719)

* fixes the targeting of the cortex bioware surgeries

* Update code/modules/surgery/advanced/bioware/cortex_imprint.dm

Co-authored-by: XDTM <heliumt@yahoo.it>

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: XDTM <heliumt@yahoo.it>

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

* One line fixes best fixes (#50801)

Haha what if exo-locomotion nanites stopped working because of one check being the wrong way around... nah, kidding.. unless??

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

* The Bogdanoffs have upgraded CRAB-17. You can't escape the dump. (#50610)

* The Bogdanoffs have upgraded CRAB-17. You can't escape the dump.

* Fixes.

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

* [Ready] Policy config refactor for Forgottenship ruin. (#50597)

* Update ghost_role_spawners.dm

* Update ghost_role_spawners.dm

* Update ghost_role_spawners.dm

* Update ghost_role_spawners.dm

* Removing all copy-pasta

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

* Fixes division by zero (#50800)

* Automatic changelog compile [ci skip]

* Fixes Null Reference + Qdel Issue in Runechat (#50830)

* runtimes bye bye

* rohesie wants it this way

* oranges fixies

* more rohesie suggestions

* cleanies

* on parent qdel moment

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

* Add look up verb for multi-z (#50782)

* Add look up verb

* Made requested changes

* Added a toggle

* Removed redundant arg from signal

* Update code/modules/mob/living/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Adds keybinding description

* Removed unused signal

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* Shrapnel mines no longer crash server, cleans up pellets a bit, take 2 (#50637)

* adjusts mines and cleans code

* nerfs holding stingbangs

* self hold nerf

* pushes the missing push

* better docs, neatness

* armor fix

* remove NONE, fixes embedded() not being called

* doc

* check qdels

* qdel's for others

* Update code/datums/components/pellet_cloud.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* once more with feeling

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* Avoid loading double extools (#50835)

* Check if thermals are actually on first.

* Extra cleanup and better logic flow. Commenting.

* Automatic changelog compile, [ci skip]

* [READY]Major explosive rebalanance and changes patch: Edge strikes back (#50775)

* Explosion rebalance patch

* more rebalancing

* reee

* removes ghetto bpp

* next balance

* Exotic Stabilizer

* forgot about this

* Maintainer suggestions

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* appveyor ree

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

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

* you can now uniquely rename the kinetic crusher

* Fixes an issue with sentient diseases and darkness (#50712)

* Fixes an issue around seeing darkness

* woosh woosh

* my soul is crushing

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

* Automatic changelog compile [ci skip]

* Asset cache updates. (#50759)

Asset cache now caches the asset's md5 This should solve the high cpu usage issues with it. line by line profile suggests that the next hotspot is the asset log.

Simplied asset cache code, moved verify functionality to a flush_assets proc that blocks until a client has all currently sending assets. (sidenote: there is an argument for moving most of asset_cache's global procs onto the client, get_asset_datum and register_asset are really the only valid global procs.)

Re-added batched passive sends since it does speed up how quickly the asset cache pre-caches to clients.

* Did you remember to install Counter-Strike Source? Adds emergency fallbacks for the most commonly edited DMIs that get icon states programmatically to help with development and bug reporting. (#50788)

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

* Fixes a runtime relating to the new explosions
This does not make any claim towards fixing any lag whatsoever.
It merely fixes a mistake that COULD happen when trying to rebuild
pipelines.

* Fix these up

* removes this

* Various Antagonist Handgun/Rifle changes; Stechkin, Stechkin APS, c20-r, m90gl (#50734)

* overhauls the crap out of a lot of antag guns and their ammo

* Should probably shoot an additional bullet per squeeze at this point

* nyoops

* So travis will stop yelling at me for new lines

* Should be all I need to fix for maps

* Touches up the stechkin sprite again

* Increased the fire rate and spread of the APS and the spread of the m90, added additional magazine types for the APS and added incendiary mags into the Spetznaz bundle to retain the fire theme, added phasic m90 ammo that penetrates through all surfaces but does significantly less damage available to ops for 8 tc, tided up the code for the aps a little more and also it's sprite.

* fixes some stuff

* So travis will cease screaming

* Changed how the phasic bullets work to being closer to xray beams, added additional flags to allow the bullets to pass through structures and machinery

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/projectiles/boxes_magazines/external/pistol.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/objects/structures.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* updated the gun sprites a bit more

* Hopefully this fixes the conflicts?

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* More updating, fatter stechkin sprite

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* fix merge conflicts and compile errors from update

* king of goat goats are now large mobs (#50797)

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

* The clown now bleeds colorful reagent on April Fools. (#50815)

## About The Pull Request

The clown now bleeds colorful reagent on April Fools.

## Why It's Good For The Game

This will increase the party potential of clowns during April Fools.

## Changelog
๐Ÿ†‘ Iamgoofball
add: The clown now bleeds Colorful Reagent on April Fools.
/๐Ÿ†‘

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

* Medical doctors no longer have genetics access. (#50826)

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

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

* Check for hidden nodes (#50849)

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

* Defib logic fixes

* Fixes Ethereals being hungry all the time (#50745)

* Update lighting.dm

* adjusts apcs

* increased values based on hunger

* feedback changes

* reverts lights

* Update tgstation.dme

* Revert "Update tgstation.dme"

This reverts commit b2597406bf.

* Update mobs.dm

* blame floyd not me

Co-authored-by: Qustinnus <Floydje123@hotmail.com>

Co-authored-by: Qustinnus <Floydje123@hotmail.com>

* Revert "Did you remember to install Counter-Strike Source? Adds emergency fallbacks for the most commonly edited DMIs that get icon states programmatically to help with development and bug reporting. (#50788)"

This reverts commit 1b056987ba.

* Automatic changelog compile [ci skip]

* updates the sprite of colossus

* updates colossus sprites

* no floating

* removing some duplicated proc definitions (#50812)

* remove duplicate definition of '/datum/component/plumbing/reaction_chamber/can_give'

* remove duplicate proc definitions for '/datum/status_effect/pacify/'

* syndicate holster correctly sets storage component's silent var

* singularity_act no longer deletes fulton 'extraction holder'

* singularity_act no longer deletes rend tears

* remove duplicate singularity_pull method from /obj/effect/cult_turf/overlay

* remove no longer used 'dir_map_to_angle' proc from reflectors

* remove duplicate /mob/living/simple_animal/bot/hygienebot/Crossed

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

* Automatic changelog compile, [ci skip]

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

* Add requirement to document #defines as well as variables (#50922)

Since there was no section for defines, the implication was that 
defines did not need to be documented.

* Automatic changelog compile [ci skip]

* Add onmob headset icons (#50905)

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

* Adds sanity to pinpointers (#50803)

* Fixes changelog compile action changing line endings of changelog file (#50761)

* Lizards X Autohiss: Ecks', Z's and Kss's. (#50763)

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

* upgrades potty's status (#50755)

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

* Fixes stabilized black runtime (#50811)

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

* Fixes mutation toxin runtime (#50810)

* Fix the random white pixel on the ears missing texture (#50885)

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

* Unborks sensory restoration and makes some tweaks to how oculine works (#50693)

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

* Fixes m90 grenade launcher reload (#50856)

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

* Fixes ORM scooping bugs. (#50809)

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

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

* Remodels king goat ruin (#50813)

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

* Fixes inhand icons for signs and plaques. (#50853)

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

* slimes can now break walls with fugu gland (#50837)

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

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

* Fixes bananium shields inhands. (#50756)

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

* Lavaland base turbine now charges SMES (#50834)

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

* Patching the DMAPI (#50862)

* Janitorial cart now uses a radial menu (#50806)

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

* Fixes Chasms (#50903)

* Rename uplink 10mm ammo. (#50890)

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

* Fixes price of parasite candy bar (#50886)

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

* Doomsday being activated while the AI is dead fix (#50889)

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

* You can now eat bees. (#50758)

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

* Radial card hands (#50729)

* Adds a radial menu to hands of cards

Currently not deleting options from the HUD correctly.

* It removes cards from the radial now

Also removed some leftover href stuff

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Moves the handradial list var to within the proc its used for

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Adds custom check

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Removes unintended change

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* Light Tiles use a Radial Menu and other tweaks (#50703)

* Pulls white out of color cycles

Makes white default
Sets other color cycling tile types to ROYGBIV
Adjusts timings of other color cycling tiles

* Further adjust color cycling

* Makes color changing a radial menu

Changes default tile color to blue
Adds "black" light tile

* Apply suggestions from code review

Thanks Rohesie!

Co-authored-by: Rohesie <rohesie@gmail.com>

* Continues adjustments based on Rohesie's review.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Acts on requested changes

Un-Statics colored lights because of dancefloor_a and dancefloor_b

* Adds custom_check callback

Restatics coloredlights,
Modifies mapper light tiles to use currentcolor rather than coloredlights

Co-authored-by: Rohesie <rohesie@gmail.com>

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

* Automatic changelog compile, [ci skip]

* Fixes overlay subsystem being lenient on large amounts of overlays (#50915)

* [READY] More Perma and Cargo Cleanups (#50845)

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

* Adds a sci wardrobe vendor to meta. (#50911)

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

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

* reduce amount of lists that exist during runtime for custom materials (#50832)

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

* Adds glass floors (That work with multi-z) (#50831)

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

* Fixes some belt sprite issues. (#50914)

* Automatic changelog compile [ci skip]

* Changes Gun Overlay update logic (#50923)

Guns now update their overlays in update_overlays(), removing the lag from mining that was caused by mutable appearances being bugged 

cl Qustinnus, AnturK
code: Moved gun overlay updating to update_overlays(), removing lag from objects when you add a flashlight / baynonet to them
/cl

thanks to Antur for pointing out that the bug with priority_overlays was caused by a bug in mutable appearances where mutable appearances directly inherit dir improperly in overlays, causing the ref to be fucked in the priority overlay list and thus being stuck in ghost land until cut_overlays() is called (Antur can probably explain this better)

Fixes #50747

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

* Automatic changelog compile, [ci skip]

* Fix DMAPI v3 (#50956)

Closes #50955

eheheheheheeh

* tgui: Fix Seed Extractor and update to tgui (#50928)

* Initial Seed Extract Update

Updates the seed extractor to work and the ui

* Damnit, forgot to run webpack

* Removed the logger and fixed toTitleCase

You would think working on a PR for 14 hours you would remember the small stuff

* Fixed the wierd Table.cell spacing.

I have no clue how that got there.

* Trying to fix some webpack issues

Travis is reporing a dffrent webpack id so its failing?  did a yarn update and repack

* forgot the lock file

* Clean up the code, final rebuild

* Deleted yarn.lock in the root

Co-authored-by: Style Mistake <stylemistake@gmail.com>

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

* new plumbing machines: fermenter and bottler (#50823)

* 1

* mystery commit

* space

* Update code/modules/plumbing/plumbers/fermenter.dm

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

* Update code/modules/plumbing/plumbers/bottler.dm

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

* Update code/modules/plumbing/plumbers/bottler.dm

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

* Update bottler.dm

* inject and then move so the products are in the output tile

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

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

* Automatic changelog compile [ci skip]

* Space dragons are now large mobs (#50932)

you can mark queens and Praetorians, so why not a giant space dragon?

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

* Correct dum dum crate name (#50945)

* Automatic changelog compile, [ci skip]

* Talking about my problems (Adds Psychologist Features) (#50553)

* perfection

* uhhhhhh something something mental help analogy

* This is a test of the emergency github system
Have some music I found :) https://www.youtube.com/watch?v=-RKvpf__N98

* And so spake the fruit

* Adds a overlay type.

* ????

* that'll do for now

* and there's the rest

* we don't need that

* that should work

* shoot me

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Wow I didn't understand that

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

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

* Automatic changelog compile, [ci skip]

* fix that one bug tg hasn't merged yet

Co-authored-by: actioninja <actioninja@gmail.com>
Co-authored-by: ArcaneMusic <hero12290@aol.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: tgstation-server <tgstation-server@tgstation13.org>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: MrDoomBringer <mrdoomboyo@gmail.com>
Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Cenrus <31044876+Cenrus@users.noreply.github.com>
Co-authored-by: William Wallace <me@wiox.me>
Co-authored-by: uomo <51800976+uomo91@users.noreply.github.com>
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: partyaddict <52793290+partyaddict@users.noreply.github.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: nightred <nightred@gmail.com>
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: jdawg1290 <jdawg1290@users.noreply.github.com>
Co-authored-by: senjx <52981310+senjx@users.noreply.github.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: NikNakFlak <Niknakflak@users.noreply.github.com>
Co-authored-by: uomo91 <uomo91@usa.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: nemvar <haukeschuemann@outlook.de>
Co-authored-by: Cartographer-D <63861499+Cartographer-D@users.noreply.github.com>
Co-authored-by: Dangerous dingidy doo <hugo.holmberg@outlook.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: XDTM <heliumt@yahoo.it>
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com>
Co-authored-by: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com>
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: Koshenko <53068134+Koshenko@users.noreply.github.com>
Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com>
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: remove32 <watkinsdakotan@gmail.com>
Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
Co-authored-by: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: babydoll <8846073+babydoll@users.noreply.github.com>
Co-authored-by: Zytolg <33048583+Zytolg@users.noreply.github.com>
Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Rodey125 <55065395+Rodey125@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Capsandi <38051413+Capsandi@users.noreply.github.com>
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Dionant <luluinsatalin@gmail.com>
Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: steamport <steamport@tutanota.com>
Co-authored-by: Coconutwarrior97 <40315842+Coconutwarrior97@users.noreply.github.com>
Co-authored-by: WarlockD <warlockd@gmail.com>
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Co-authored-by: trollbreeder <trollbreeder@users.noreply.github.com>
Co-authored-by: redguy999 <61719178+redguy999@users.noreply.github.com>
Co-authored-by: michiboo <chanmickyyun@gmail.com>
master
windarkata 3 months ago
committed by GitHub
parent
commit
becf086455
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
100 changed files with 21342 additions and 378437 deletions
  1. +2
    -2
      .github/AUTODOC_GUIDE.md
  2. +3
    -0
      .github/CODEOWNERS
  3. +25
    -0
      .github/CONTRIBUTING.md
  4. +5
    -4
      .github/POLICYCONFIG.md
  5. +0
    -38
      .github/workflows/autobuild_tgui.yml
  6. +4
    -0
      .github/workflows/compile_changelogs.yml
  7. +2
    -1
      .github/workflows/stale.yml
  8. +11
    -0
      .gitlab-ci.yml
  9. +5
    -6
      README.md
  10. +10
    -3
      SQL/database_changelog.txt
  11. +1
    -0
      SQL/tgstation_schema.sql
  12. +1
    -0
      SQL/tgstation_schema_prefixed.sql
  13. +732
    -176
      _maps/RandomRuins/LavaRuins/kinggoatboss.dmm
  14. +18
    -13
      _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
  15. +9
    -9
      _maps/RandomRuins/SpaceRuins/bus.dmm
  16. +3
    -3
      _maps/RandomRuins/SpaceRuins/caravanambush.dmm
  17. +3
    -3
      _maps/RandomRuins/SpaceRuins/deepstorage.dmm
  18. +18
    -21
      _maps/RandomRuins/SpaceRuins/forgottenship.dmm
  19. +7
    -17
      _maps/RandomRuins/SpaceRuins/hellfactory.dmm
  20. +429
    -259
      _maps/RandomRuins/SpaceRuins/kinggoatarena.dmm
  21. +1
    -1
      _maps/RandomRuins/SpaceRuins/listeningstation.dmm
  22. +2
    -2
      _maps/RandomRuins/SpaceRuins/spacehotel.dmm
  23. +2
    -2
      _maps/RandomZLevels/SnowCabin.dmm
  24. +14
    -44
      _maps/RandomZLevels/caves.dmm
  25. +2
    -2
      _maps/RandomZLevels/moonoutpost19.dmm
  26. +1
    -1
      _maps/RandomZLevels/research.dmm
  27. +0
    -3
      _maps/_basemap.dm
  28. +0
    -12
      _maps/donutstation.json
  29. +0
    -12
      _maps/kilostation.json
  30. +6473
    -5237
      _maps/map_files/BoxStation/BoxStation.dmm
  31. +189
    -152
      _maps/map_files/Deltastation/DeltaStation2.dmm
  32. +0
    -117772
      _maps/map_files/Donutstation/Donutstation.dmm
  33. +0
    -86396
      _maps/map_files/Donutstation/Donutstation_LVL2.dmm
  34. +0
    -7
      _maps/map_files/Donutstation/job_changes.dm
  35. +0
    -159344
      _maps/map_files/KiloStation/KiloStation.dmm
  36. +9741
    -7850
      _maps/map_files/MetaStation/MetaStation.dmm
  37. +177
    -96
      _maps/map_files/PubbyStation/PubbyStation.dmm
  38. +9
    -15
      _maps/map_files/debug/multiz.dmm
  39. +5
    -5
      _maps/map_files/generic/CentCom.dmm
  40. +1
    -1
      _maps/multiz_debug.json
  41. +2666
    -0
      _maps/shuttles/emergency_cruise.dmm
  42. +2
    -2
      _maps/shuttles/emergency_narnar.dmm
  43. +1
    -1
      _maps/shuttles/whiteship_kilo.dmm
  44. BIN
      byond-extools.dll
  45. +0
    -1
      code/__DEFINES/DNA.dm
  46. +7
    -2
      code/__DEFINES/_tick.dm
  47. +3
    -0
      code/__DEFINES/admin.dm
  48. +3
    -0
      code/__DEFINES/atmospherics.dm
  49. +22
    -18
      code/__DEFINES/atom_hud.dm
  50. +9
    -0
      code/__DEFINES/botany.dm
  51. +1
    -0
      code/__DEFINES/combat.dm
  52. +1
    -2
      code/__DEFINES/dcs/signals.dm
  53. +2
    -0
      code/__DEFINES/dye_keys.dm
  54. +2
    -0
      code/__DEFINES/flags.dm
  55. +9
    -0
      code/__DEFINES/food.dm
  56. +1
    -1
      code/__DEFINES/inventory.dm
  57. +3
    -1
      code/__DEFINES/is_helpers.dm
  58. +2
    -1
      code/__DEFINES/layers.dm
  59. +2
    -1
      code/__DEFINES/logging.dm
  60. +6
    -0
      code/__DEFINES/misc.dm
  61. +1
    -1
      code/__DEFINES/mobs.dm
  62. +1
    -0
      code/__DEFINES/obj_flags.dm
  63. +1
    -0
      code/__DEFINES/preferences.dm
  64. +15
    -0
      code/__DEFINES/reactions.dm
  65. +0
    -2
      code/__DEFINES/research.dm
  66. +2
    -0
      code/__DEFINES/role_preferences.dm
  67. +10
    -3
      code/__DEFINES/subsystems.dm
  68. +3
    -2
      code/__DEFINES/tgs.config.dm
  69. +42
    -27
      code/__DEFINES/tgs.dm
  70. +6
    -0
      code/__DEFINES/traits.dm
  71. +4
    -0
      code/__HELPERS/_logging.dm
  72. +2
    -2
      code/__HELPERS/icons.dm
  73. +60
    -0
      code/__HELPERS/mobs.dm
  74. +9
    -0
      code/__HELPERS/text.dm
  75. +11
    -59
      code/__HELPERS/unsorted.dm
  76. +0
    -39
      code/__HELPERS/unused.dm
  77. +4
    -0
      code/_compile_options.dm
  78. +4
    -1
      code/_globalvars/lists/maintenance_loot.dm
  79. +2
    -0
      code/_globalvars/lists/objects.dm
  80. +2
    -0
      code/_globalvars/misc.dm
  81. +1
    -4
      code/_onclick/hud/guardian.dm
  82. +9
    -4
      code/_onclick/hud/map_popups.dm
  83. +6
    -0
      code/_onclick/hud/radial.dm
  84. +5
    -5
      code/_onclick/item_attack.dm
  85. +2
    -0
      code/_onclick/observer.dm
  86. +4
    -0
      code/_onclick/other_mobs.dm
  87. +9
    -0
      code/controllers/configuration/entries/general.dm
  88. +18
    -6
      code/controllers/master.dm
  89. +37
    -34
      code/controllers/subsystem.dm
  90. +20
    -2
      code/controllers/subsystem/air.dm
  91. +0
    -3
      code/controllers/subsystem/chat.dm
  92. +0
    -427
      code/controllers/subsystem/demo.dm
  93. +363
    -264
      code/controllers/subsystem/explosions.dm
  94. +1
    -6
      code/controllers/subsystem/garbage.dm
  95. +1
    -1
      code/controllers/subsystem/input.dm
  96. +10
    -3
      code/controllers/subsystem/job.dm
  97. +22
    -0
      code/controllers/subsystem/materials.dm
  98. +1
    -1
      code/controllers/subsystem/nightshift.dm
  99. +6
    -1
      code/controllers/subsystem/overlays.dm
  100. +1
    -1
      code/controllers/subsystem/shuttle.dm

+ 2
- 2
.github/AUTODOC_GUIDE.md View File

@@ -73,8 +73,8 @@ Finally we give a longer multi paragraph description of the class and it's detai
*/
```

### Documenting a variable
Give a short explanation of what the variable is in the context of the class.
### Documenting a variable/define
Give a short explanation of what the variable, in the context of the class, or define is.
```
/// Type path of item to go in suit slot
var/suit = null


+ 3
- 0
.github/CODEOWNERS View File

@@ -4,6 +4,9 @@
# In the event that multiple org members are to be informed of changes
# to the same file or dir, add them to the end under Multiple Owners

# bobbahbrown
/code/datums/chatmessage.dm @bobbahbrown

# ChangelingRain

/code/__DEFINES/clockcult.dm @ChangelingRain


+ 25
- 0
.github/CONTRIBUTING.md View File

@@ -206,6 +206,30 @@ This is good:
````
This prevents nesting levels from getting deeper then they need to be.

### Use our time defines

The codebase contains some defines which will automatically multiply a number by the correct amount to get a number in deciseconds. Using these is preffered over using a literal amount in deciseconds.

The defines are as follows:
* SECONDS
* MINUTES
* HOURS

This is bad:
````DM
/datum/datum1/proc/proc1()
if(do_after(mob, 15))
mob.dothing()
````

This is good:
````DM
/datum/datum1/proc/proc1()
if(do_after(mob, 1.5 SECONDS))
mob.dothing()
````


### Develop Secure Code

* Player input must always be escaped safely, we recommend you use stripped_input in all cases where you would use input. Essentially, just always treat input from players as inherently malicious and design with that use case in mind
@@ -408,6 +432,7 @@ Do not add any of the following in a Pull Request or risk getting the PR closed:
* National Socialist Party of Germany content, National Socialist Party of Germany related content, or National Socialist Party of Germany references
* Code where one line of code is split across mutiple lines (except for multiple, separate strings and comments; in those cases, existing longer lines must not be split up)
* Code adding, removing, or updating the availability of alien races/species/human mutants without prior approval. Pull requests attempting to add or remove features from said races/species/mutants require prior approval as well.
* Code which violates GitHub's [terms of service](https://github.com/site/terms).

Just because something isn't on this list doesn't mean that it's acceptable. Use common sense above all else.



+ 5
- 4
.github/POLICYCONFIG.md View File

@@ -22,11 +22,12 @@ You can access the string of text through the `get_policy(keyword)` proc, this t

This will return a configured string of text, or blank/null if no policy string is set.

This is also accessible to the user if they use `/client/verb/policy()` which will display to them a list of all the policy texts for keywords applicable to the mob, you can add/modify the list of keywords by modifying the `get_policy_keywords()` proc of a mob type where that is relevant.
This is also accessible to the user if they use `/client/verb/policy()` which will display to them a list of all the policy texts for keywords applicable to the mob, you can add/modify the list of keywords by modifying the `get_policy_keywords()` proc of a mob type where that is relevant. **If you cannot use the verb to get your policy at any point, the feature is considered to NOT be supported.**

### Example
Here is a simple example taken from the slime pyroclastic event
```
### Relaying Specific Policy To Players, Example

Here is a simple example taken from the slime pyroclastic event to relay specific policy.
```DM
var/policy = get_policy(ROLE_PYROCLASTIC_SLIME)
if (policy)
to_chat(S, policy)


+ 0
- 38
.github/workflows/autobuild_tgui.yml View File

@@ -1,38 +0,0 @@
name: Autobuild TGUI

on:
push:
branches:
- 'master'
paths:
- 'tgui/**.js'
- 'tgui/**.scss'

jobs:
build:
name: Rebuild TGUI
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
with:
fetch-depth: 25
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '>=12.13'
- name: Build TGUI
run: bin/tgui --ci
working-directory: ./tgui
- name: Commit Artifacts
run: |
git config --local user.email "action@github.com"
git config --local user.name "TGUI"
git pull origin master
git commit -m "Automatic TGUI Rebuild [ci skip]" -a || true
- name: Push Artifacts
uses: ad-m/github-push-action@master
env:
GITHUB_ACTOR: comfyorange
with:
github_token: ${{ secrets.GITHUB_MASTER_KEY }}

+ 4
- 0
.github/workflows/compile_changelogs.yml View File

@@ -17,6 +17,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install pyyaml
sudo apt-get install dos2unix
- name: "Checkout"
uses: actions/checkout@v1
with:
@@ -24,6 +25,9 @@ jobs:
- name: "Compile"
run: |
python tools/ss13_genchangelog.py html/changelog.html html/changelogs
- name: "Convert Lineendings"
run: |
unix2dos html/changelogs/.all_changelog.yml
- name: Commit
run: |
git config --local user.email "action@github.com"


+ 2
- 1
.github/workflows/stale.yml View File

@@ -13,7 +13,8 @@ jobs:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being closed by a maintainer if it is not updated or reviews are not addressed. If your PR is closed as stale, feel free to open a new one after dealing with the issues. This may also be an indication that the maintainers do not have interest in this change, you can try to convince them otherwise, or persist in the doomed world you have created."
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
days-before-stale: 7
days-before-close: 7
stale-pr-label: 'Stale'
exempt-pr-label: 'RED LABEL'

+ 11
- 0
.gitlab-ci.yml View File

@@ -0,0 +1,11 @@
build:
stage: build
rules:
- if: $CI_MERGE_REQUEST_IID || $CI_COMMIT_REF_NAME == "master"
changes:
- tgui/**/*.js
- tgui/**/*.scss
when: always
image: node:lts
script:
- tgui/bin/tgui --ci

+ 5
- 6
README.md View File

@@ -1,7 +1,9 @@
## /tg/station codebase
[![Build Status](https://travis-ci.org/tgstation/tgstation.png)](https://travis-ci.org/tgstation/tgstation) [![Krihelimeter](https://www.krihelinator.xyz/badge/tgstation/tgstation)](https://www.krihelinator.xyz)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)
[![Build Status](https://travis-ci.org/tgstation/tgstation.png)](https://travis-ci.org/tgstation/tgstation)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open")
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue")
![Coverage](https://img.shields.io/badge/coverage---3%25-red.svg)
[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
@@ -11,7 +13,7 @@
* **Codedocs:** https://codedocs.tgstation13.org/
* **/tg/station Discord:** https://tgstation13.org/phpBB/viewforum.php?f=60
* **Coderbus Discord:** https://discord.gg/Vh8TJp9
* **IRC:** irc://irc.rizon.net/coderbus (dead)
* ~~**IRC:** irc://irc.rizon.net/coderbus~~ (dead)
This is the codebase for the /tg/station flavoured fork of SpaceStation 13.
@@ -42,9 +44,6 @@ All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 a
See LICENSE and GPLv3.txt for more details.
tgui clientside is licensed as a subproject under the MIT license.
Font Awesome font files, used by tgui, are licensed under the SIL Open Font License v1.1
tgui assets are licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/).
The TGS3 API is licensed as a subproject under the MIT license.
See the footers of code/\_\_DEFINES/server\_tools.dm, code/modules/server\_tools/st\_commands.dm, and code/modules/server\_tools/st\_inteface.dm for the MIT license.


+ 10
- 3
SQL/database_changelog.txt View File

@@ -1,15 +1,22 @@
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.

The latest database version is 5.7; The query to update the schema revision table is:
The latest database version is 5.8; The query to update the schema revision table is:

INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 7);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 8);
or
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 7);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 8);

In any query remember to add a prefix to the table names if you use one.

-----------------------------------------------------

Version 5.8, 7 April 2020, by Jordie0608
Modified table `messages`, adding column `deleted_ckey` to record who deleted a message.

ALTER TABLE `messages` ADD COLUMN `deleted_ckey` VARCHAR(32) NULL DEFAULT NULL AFTER `deleted`;

-----------------------------------------------------

Version 5.7, 10 January 2020 by Atlanta-Ned
Added ticket table for tracking ahelp tickets in the database.



+ 1
- 0
SQL/tgstation_schema.sql View File

@@ -258,6 +258,7 @@ CREATE TABLE `messages` (
`lasteditor` varchar(32) DEFAULT NULL,
`edits` text,
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
`deleted_ckey` VARCHAR(32) NULL DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`, `deleted`),
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`, `deleted`),


+ 1
- 0
SQL/tgstation_schema_prefixed.sql View File

@@ -258,6 +258,7 @@ CREATE TABLE `SS13_messages` (
`lasteditor` varchar(32) DEFAULT NULL,
`edits` text,
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
`deleted_ckey` VARCHAR(32) NULL DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`, `deleted`),
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`, `deleted`),


+ 732
- 176
_maps/RandomRuins/LavaRuins/kinggoatboss.dmm View File

@@ -9,260 +9,816 @@
/turf/closed/wall/mineral/gold,
/area/ruin/powered)
"d" = (
/obj/structure/mineral_door/transparent/diamond{
sheetAmount = 1
},
/turf/open/floor/mineral/silver,
/area/ruin/powered)
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"e" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/gold,
/turf/closed/wall/r_wall,
/area/ruin/powered)
"f" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/gold,
/turf/open/floor/carpet,
/area/ruin/powered)
"g" = (
/turf/open/floor/mineral/diamond,
/area/ruin/powered)
"k" = (
"h" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/retaliate/goat/guard{
health = 0;
icon_state = "goat_guard_dead"
},
/turf/open/floor/mineral/diamond,
/area/ruin/powered)
"i" = (
/obj/structure/ladder/unbreakable{
desc = "This seems to be the ladder to the King of Goats lair. Looks to be a one way trip...";
id = "goatlayer";
name = "Ladder to the King of Goats Lair"
},
/turf/open/floor/mineral/gold,
/turf/open/floor/mineral/diamond,
/area/ruin/powered)
"q" = (
/obj/effect/mob_spawn/human/miner{
assignedrole = "null";
desc = "Seems this miner tried to cheese the arena using bluespace crystals. Did not turn out well";
mob_gender = "female";
mob_name = "Lyna Lavas";
name = "Lyna Lavas"
"j" = (
/obj/item/paper/crumpled{
info = "Lest ye be prepared, abandon all hope ye who enter here.";
name = "Wise Man's Warning."
},
/obj/item/stack/ore/bluespace_crystal,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/mineral/gold,
/area/ruin/powered)
"r" = (
/obj/machinery/light{
dir = 4
"k" = (
/obj/structure/mineral_door/transparent/diamond{
sheetAmount = 1
},
/turf/open/floor/mineral/gold,
/area/ruin/powered)
"l" = (
/turf/open/floor/carpet/cyan,
/area/ruin/powered)
"m" = (
/turf/open/floor/carpet/red,
/area/ruin/powered)
"n" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/carpet/red,
/area/ruin/powered)
"p" = (
/turf/template_noop,
/area/template_noop)
"q" = (
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"r" = (
/turf/open/floor/wood,
/area/ruin/powered)
"s" = (
/obj/item/paper/crumpled{
info = "Lest ye be prepared, abandon all hope ye who enter here.";
name = "Wise Man's Warning."
},
/obj/effect/decal/remains/human,
/turf/open/floor/mineral/diamond,
/obj/structure/mineral_door/silver,
/turf/open/floor/carpet/red,
/area/ruin/powered)
"t" = (
/obj/machinery/light,
/turf/open/floor/mineral/gold,
/obj/structure/mineral_door/iron,
/turf/open/floor/carpet/red,
/area/ruin/powered)
"u" = (
/turf/closed/wall/r_wall/rust,
/area/ruin/powered)
"v" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/retaliate/goat/guard{
health = 0;
icon_state = "goat_guard_dead"
},
/turf/open/floor/carpet/cyan,
/area/ruin/powered)
"w" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/retaliate/goat/guard{
health = 0;
icon_state = "goat_guard_dead"
},
/turf/open/floor/carpet/red,
/area/ruin/powered)
"x" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/carpet/cyan,
/area/ruin/powered)
"y" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/spear,
/mob/living/simple_animal/hostile/retaliate/goat{
health = 0;
icon_state = "goat_dead"
},
/turf/open/floor/wood,
/area/ruin/powered)
"z" = (
/obj/structure/stone_tile/slab/cracked,
/mob/living/simple_animal/hostile/retaliate/goat{
health = 0;
icon_state = "goat_dead"
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"A" = (
/obj/structure/stone_tile{
dir = 4
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"B" = (
/obj/structure/stone_tile{
dir = 1
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"C" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 8
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"D" = (
/obj/structure/stone_tile/block,
/obj/structure/stone_tile/block{
dir = 1
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"E" = (
/obj/structure/stone_tile/slab/burnt,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"F" = (
/obj/structure/stone_tile/surrounding_tile,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"G" = (
/obj/structure/stone_tile/block/burnt,
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"H" = (
/turf/open/floor/mineral/gold,
/area/ruin/powered)
"I" = (
/obj/structure/stone_tile{
dir = 8
},
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile{
dir = 1
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"J" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/retaliate/goat{
health = 0;
icon_state = "goat_dead"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"K" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile{
dir = 4
},
/obj/structure/stone_tile,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"L" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"M" = (
/obj/structure/statue/sandstone/assistant,
/obj/structure/stone_tile/slab/burnt,
/obj/item/gun/magic/staff{
pixel_x = 10;
pixel_y = 3
},
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
"N" = (
/obj/structure/bonfire/prelit,
/turf/open/floor/carpet/cyan,
/area/ruin/powered)
"O" = (
/obj/item/hatchet,
/turf/open/floor/carpet/red,
/area/ruin/powered)
"P" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/retaliate/goat{
health = 0;
icon_state = "goat_dead"
},
/turf/open/floor/carpet/red,
/area/ruin/powered)

(1,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
p
p
p
p
p
p
d
d
d
d
d
d
d
p
p
p
p
p
p
p
p
p
p
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
p
p
p
d
d
d
d
d
d
d
d
d
d
d
d
d
d
p
p
p
p
p
p
"}
(3,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
p
p
p
p
p
d
d
q
q
q
q
q
d
d
d
d
d
d
d
p
p
p
p
"}
(4,1,1) = {"
a
a
a
b
b
c
p
p
d
c
b
b
a
a
a
d
d
d
q
q
q
q
q
q
d
d
d
q
q
q
d
p
p
p
p
"}
(5,1,1) = {"
a
a
a
b
p
p
d
d
d
d
e
e
u
u
e
e
u
d
d
q
f
H
f
H
b
a
a
a
z
q
A
q
q
d
p
"}
(6,1,1) = {"
a
a
a
c
p
q
q
d
d
d
e
g
g
g
t
c
a
a
a
f
f
f
f
f
u
u
u
e
e
q
B
A
q
d
p
"}
(7,1,1) = {"
a
a
a
p
q
q
d
H
g
k
s
H
q
d
u
f
f
f
f
f
e
r
r
r
u
d
q
q
a
a
a
p
"}
(8,1,1) = {"
a
a
a
c
p
p
q
d
d
u
u
l
l
l
l
l
e
g
g
g
t
c
a
a
e
r
r
u
e
M
q
J
L
a
"}
(9,1,1) = {"
a
a
a
p
p
q
d
d
e
b
H
b
c
b
b
l
l
s
y
r
H
r
H
b
e
C
q
a
a
a
"}
(10,1,1) = {"
a
a
a
b
b
c
p
d
c
d
d
d
e
b
g
H
H
b
N
w
s
m
m
n
t
D
G
a
a
a
"}
(11,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
d
d
d
q
d
e
c
H
g
H
c
m
m
e
m
n
m
e
d
d
d
a
a
"}
(12,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
d
d
q
q
d
e
b
H
i
j
k
n
m
u
m
m
m
u
d
d
d
d
d
"}
(13,1,1) = {"
d
d
q
q
q
e
c
H
h
H
c
m
m
e
m
O
m
e
C
q
d
d
a
"}
(14,1,1) = {"
p
d
d
d
d
e
b
g
H
H
b
N
m
s
m
P
n
t
E
I
K
a
L
"}
(15,1,1) = {"
p
d
d
d
d
u
b
b
c
b
b
l
x
s
r
r
r
u
F
q
q
L
J
"}
(16,1,1) = {"
p
p
p
d
d
u
u
l
l
l
v
l
u
u
r
r
u
u
M
q
q
a
a
"}
(17,1,1) = {"
p
q
q
q
d
d
u
f
f
f
f
f
u
r
r
r
u
d
q
q
d
d
a
a
a
a
a
a
a
a
a
"}
(18,1,1) = {"
p
q
q
q
d
d
u
f
f
f
f
f
e
e
e
e
e
d
d
d
p
p
p
"}
(19,1,1) = {"
p
q
q
q
d
d
u
u
e
e
e
e
e
d
d
q
q
q
q
d
d
p
p
"}
(20,1,1) = {"
p
q
q
d
d
d
d
d
d
d
d
d
d
d
q
q
q
q
q
d
d
p
p
"}
(21,1,1) = {"
p
p
d
d
d
q
d
q
q
q
q
d
d
d
q
q
d
d
d
d
d
p
p
"}
(22,1,1) = {"
p
p
d
d
d
d
d
d
q
q
q
d
d
p
d
d
d
d
d
p
p
p
p
"}
(23,1,1) = {"
p
p
p
p
p
d
d
d
d
d
d
d
d
p
p
p
p
p
p
p
p
p
p
"}
(24,1,1) = {"
p
p
p
p
p
p
p
d
d
d
d
d
p
p
p
p
p
p
p
p
p
p
p
"}

+ 18
- 13
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm View File

@@ -505,19 +505,19 @@
pixel_y = 6
},
/obj/item/ammo_box/c10mm,
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m9mm{
pixel_x = -5;
pixel_y = 5
},
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m9mm{
pixel_x = -2;
pixel_y = 2
},
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m9mm{
pixel_x = 1;
pixel_y = -1
},
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m9mm{
pixel_x = 4;
pixel_y = -4
},
@@ -2452,7 +2452,7 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"hM" = (
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/sniper_rounds,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
@@ -2478,7 +2478,7 @@
/area/ruin/unpowered/syndicate_lava_base/dormitories)
"hQ" = (
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m9mm,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
@@ -3357,7 +3357,7 @@
/area/ruin/unpowered/syndicate_lava_base/bar)
"jA" = (
/obj/structure/table/wood,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/sniper_rounds,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered/syndicate_lava_base/dormitories)
@@ -4657,6 +4657,7 @@
/area/ruin/unpowered/syndicate_lava_base/engineering)
"mh" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/structure/cable,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"mi" = (
@@ -5607,6 +5608,7 @@
/obj/machinery/atmospherics/components/binary/pump{
dir = 1
},
/obj/structure/cable,
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"oe" = (
@@ -5779,7 +5781,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/structure/cable,
/turf/open/floor/engine,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ou" = (
@@ -5812,7 +5813,6 @@
/area/ruin/unpowered/syndicate_lava_base/engineering)
"oA" = (
/obj/machinery/igniter/incinerator_syndicatelava,
/obj/structure/cable,
/turf/open/floor/engine/vacuum,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"oB" = (
@@ -5900,6 +5900,10 @@
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"sP" = (
/obj/structure/cable,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"ta" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 8;
@@ -5918,6 +5922,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 5
},
/obj/structure/cable,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"vu" = (
@@ -7867,9 +7872,9 @@ IJ
IJ
IJ
uB
ju
ju
ju
sP
sP
sP
ab
ab
ab
@@ -7919,7 +7924,7 @@ Lp
od
Lp
oz
ju
sP
ju
nf
ab


+ 9
- 9
_maps/RandomRuins/SpaceRuins/bus.dmm View File

@@ -62,7 +62,7 @@
/area/ruin/unpowered/no_grav)
"an" = (
/obj/structure/fluff/bus/passable/seat,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -83,7 +83,7 @@
/area/ruin/unpowered/no_grav)
"aq" = (
/obj/structure/fluff/bus/passable/seat,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
@@ -146,9 +146,9 @@
"aA" = (
/obj/structure/fluff/bus/passable,
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -170,7 +170,7 @@
/area/ruin/unpowered/no_grav)
"aD" = (
/obj/structure/fluff/bus/passable,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -242,7 +242,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aP" = (
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
@@ -266,7 +266,7 @@
"aU" = (
/obj/structure/fluff/bus/passable/seat,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -297,7 +297,7 @@
"aZ" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},


+ 3
- 3
_maps/RandomRuins/SpaceRuins/caravanambush.dmm View File

@@ -696,11 +696,11 @@
/obj/machinery/light/small{
dir = 1
},
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m9mm_aps{
pixel_x = -3;
pixel_y = 3
},
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m9mm_aps,
/turf/open/floor/plasteel/airless/dark,
/area/shuttle/caravan/freighter2)
"hX" = (
@@ -1038,7 +1038,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/automatic/pistol/APS,
/obj/item/gun/ballistic/automatic/pistol/aps,
/turf/open/floor/plasteel/airless/dark,
/area/shuttle/caravan/freighter2)
"js" = (


+ 3
- 3
_maps/RandomRuins/SpaceRuins/deepstorage.dmm View File

@@ -343,12 +343,12 @@
"aW" = (
/obj/structure/closet/cardboard,
/obj/effect/turf_decal/delivery,
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm{
pixel_x = -3;
pixel_y = 3
},
/obj/item/ammo_box/magazine/pistolm9mm,
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/m9mm{
pixel_x = 3;
pixel_y = -3
},


+ 18
- 21
_maps/RandomRuins/SpaceRuins/forgottenship.dmm View File

@@ -9,12 +9,11 @@
/area/ruin/unpowered/no_grav)
"ac" = (
/obj/machinery/porta_turret/syndicate/energy{
armor = list("melee" = 80, "bullet" = 30, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100);
armor = list("melee" = 40, "bullet" = 40, "laser" = 60, "energy" = 60, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100);
dir = 4;
name = "Syndicate Ship Turret";
on = 0;
throw_speed = 4;
use_power = 1
shot_delay = 10
},
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
@@ -133,10 +132,12 @@
secure = 1
},
/obj/item/coin/antagtoken,
/obj/item/coin/gold,
/obj/item/encryptionkey/syndicate,
/obj/item/encryptionkey/syndicate,
/obj/item/encryptionkey/syndicate,
/obj/item/dnainjector/thermal,
/obj/item/storage/box/firingpins,
/obj/item/storage/box/firingpins,
/obj/item/storage/box/firingpins/syndicate,
/obj/item/storage/box/firingpins/syndicate,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"az" = (
@@ -150,7 +151,6 @@
/obj/machinery/light{
dir = 1
},
/obj/item/aiModule/reset/purge,
/obj/structure/table/reinforced,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
@@ -244,7 +244,7 @@
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aN" = (
/obj/item/stack/sheet/mineral/uranium{
amount = 50
amount = 15
},
/obj/structure/cable,
/obj/machinery/light{
@@ -493,8 +493,8 @@
secure = 1
},
/obj/item/crowbar/red,
/obj/item/ammo_box/magazine/pistolm9mm,
/obj/item/ammo_box/magazine/pistolm9mm,
/obj/item/ammo_box/magazine/m9mm,
/obj/item/ammo_box/magazine/m9mm,
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"bx" = (
@@ -764,12 +764,11 @@
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"ci" = (
/obj/machinery/porta_turret/syndicate/energy{
armor = list("melee" = 80, "bullet" = 30, "laser" = 50, "energy" = 50, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100);
armor = list("melee" = 40, "bullet" = 40, "laser" = 60, "energy" = 60, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100);
dir = 4;
name = "Syndicate Ship Turret";
on = 0;
throw_speed = 4;
use_power = 1
shot_delay = 10
},
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
@@ -785,7 +784,7 @@
/obj/machinery/light{
dir = 1
},
/obj/item/aiModule/core/freeformcore,
/obj/item/aiModule/core/full/cybersun,
/obj/structure/table/reinforced,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
@@ -840,9 +839,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_cargopod)
"ct" = (
/obj/machinery/vending/medical/syndicate_access{
premium = list(/obj/item/reagent_containers/medigel/instabitaluri = 2, /obj/item/storage/pill_bottle/psicodine = 2, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/storage/firstaid = 5, /obj/item/storage/firstaid/advanced = 2, /obj/item/storage/firstaid/tactical = 1, /obj/item/shears = 1, /obj/item/plunger/reinforced = 2)
},
/obj/machinery/vending/medical/syndicate_access/cybersun,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"cu" = (
@@ -889,10 +886,10 @@
req_one_access_txt = "150"
},
/obj/item/stack/sheet/mineral/titanium{
amount = 50
amount = 40
},
/obj/item/stack/sheet/mineral/uranium{
amount = 20
amount = 15
},
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
@@ -1241,10 +1238,10 @@
req_one_access_txt = "150"
},
/obj/item/stack/sheet/mineral/gold{
amount = 50
amount = 30
},
/obj/item/stack/sheet/mineral/silver{
amount = 50
amount = 30
},
/obj/machinery/light,
/turf/open/floor/pod/dark,


+ 7
- 17
_maps/RandomRuins/SpaceRuins/hellfactory.dmm View File

@@ -969,11 +969,6 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plastic,
/area/ruin/space/has_grav/hellfactory)
"lv" = (
/obj/structure/cable,
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/hellfactory)
"lR" = (
/obj/machinery/light/floor,
/obj/effect/turf_decal/bot_white/right,
@@ -1036,10 +1031,6 @@
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/holofloor/wood,
/area/ruin/space/has_grav/hellfactory)
"zI" = (
/obj/structure/cable,
/turf/closed/wall/r_wall/rust,
/area/ruin/space/has_grav/hellfactory)
"BC" = (
/obj/machinery/light/floor,
/obj/effect/turf_decal/bot_white/left,
@@ -1057,7 +1048,6 @@
/area/ruin/space/has_grav/hellfactory)
"Gs" = (
/obj/structure/cable,
/obj/structure/cable,
/turf/closed/wall/r_wall/rust,
/area/ruin/space/has_grav/hellfactory)
"GE" = (
@@ -1476,8 +1466,8 @@ aJ
aX
fj
EP
zI
lv
Gs
EP
by
by
bK
@@ -1504,7 +1494,7 @@ Yd
ah
aA
bn
zI
Gs
by
Wh
Fs
@@ -1561,12 +1551,12 @@ aB
Gs
EP
EP
zI
Gs
EP
zI
Gs
EP
Gs
EP
zI
lv
Zh
cA
by


+ 429
- 259
_maps/RandomRuins/SpaceRuins/kinggoatarena.dmm View File

@@ -1,60 +1,230 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/indestructible/riveted/uranium,
/turf/closed/indestructible/riveted,
/area/ruin/powered/kinggoat_arena)
"b" = (
/turf/open/indestructible/diamond,
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"c" = (
/obj/structure/chair/bronze,
/mob/living/simple_animal/hostile/megafauna/king,
/turf/open/indestructible/diamond,
/area/ruin/powered/kinggoat_arena)
"d" = (
/mob/living/simple_animal/hostile/retaliate/goat/guard/pope,
/turf/open/indestructible/diamond,
/turf/open/indestructible{
icon_state = "gold"
},
/area/ruin/powered/kinggoat_arena)
"e" = (
/obj/effect/landmark/portal_exit{
id = "king goat arena"
},
/turf/open/indestructible/diamond,
/turf/open/indestructible{
icon_state = "gold"
},
/area/ruin/powered/kinggoat_arena)
"f" = (
/mob/living/simple_animal/hostile/retaliate/goose{
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0);
damage_coeff = list("brute" = 0, "fire" = 0, "toxin" = 0, "clone" = 0, "stamina" = 0, "oxygen" = 0);
desc = "If you are alive and reading this you should not be in this room and should prob tell a admin how you got here.";
name = "The Paradox Goose"
"h" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/indestructible/diamond,
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"g" = (
"k" = (
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"m" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/open/indestructible{
icon_state = "engine"
},
/area/ruin/powered/kinggoat_arena)
"n" = (
/obj/structure/fluff/big_chain,
/turf/open/indestructible{
icon_state = "engine"
},
/area/ruin/powered/kinggoat_arena)
"o" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/mob/living/simple_animal/hostile/retaliate/goat/guard{
health = 0;
icon_state = "goat_guard_dead"
},
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"p" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/indestructible{
icon_state = "engine"
},
/area/ruin/powered/kinggoat_arena)
"q" = (
/obj/effect/decal/cleanable/blood/old,
/obj/structure/lattice/lava,
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"r" = (
/mob/living/simple_animal/hostile/retaliate/goat/harem,
/turf/open/indestructible{
icon_state = "silver"
},
/area/ruin/powered/kinggoat_arena)
"s" = (
/obj/effect/mob_spawn/human/miner{
assignedrole = "null";
desc = "Seems this miner tried to cheese the arena using bluespace crystals. Did not turn out well";
mob_gender = "female";
mob_name = "Lyna Lavas";
name = "Lyna Lavas"
},
/obj/effect/decal/cleanable/blood/old,
/obj/item/stack/ore/bluespace_crystal,
/obj/structure/lattice/lava,
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"t" = (
/obj/structure/ladder/unbreakable{
desc = "This seems to be the ladder to the King of Goats' lair. Looks to be a one way trip...";
height = 1;
id = "goatlayer";
name = "Ladder to the King of Goats Lair"
},
/turf/open/indestructible/gold,
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"h" = (
/turf/open/indestructible/gold,
"u" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/indestructible{
icon_state = "engine"
},
/area/ruin/powered/kinggoat_arena)
"v" = (
/mob/living/simple_animal/hostile/retaliate/goat/guard/pope,
/turf/open/indestructible{
icon_state = "gold"
},
/area/ruin/powered/kinggoat_arena)
"z" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/indestructible{
icon_state = "engine"
},
/area/ruin/powered/kinggoat_arena)
"A" = (
/turf/open/indestructible{
icon_state = "gold"
},
/area/ruin/powered/kinggoat_arena)
"B" = (
/turf/open/indestructible/hoteltile,
/area/space)
"C" = (
/obj/item/kinetic_crusher,
/obj/structure/lattice/lava,
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"i" = (
"D" = (
/obj/structure/lattice/lava,
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"F" = (
/obj/structure/dresser,
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"G" = (
/turf/open/indestructible/hoteltile,
/area/ruin/powered/kinggoat_arena)
"I" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/indestructible/carpet,
/area/ruin/powered/kinggoat_arena)
"J" = (
/obj/effect/decal/cleanable/blood/old,
/obj/structure/lattice/lava,
/mob/living/simple_animal/hostile/retaliate/goat/guard{
health = 0;
icon_state = "goat_guard_dead"
},
/turf/open/lava,
/area/ruin/powered/kinggoat_arena)
"K" = (
/mob/living/simple_animal/hostile/retaliate/goose{
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0);
damage_coeff = list("brute" = 0, "fire" = 0, "toxin" = 0, "clone" = 0, "stamina" = 0, "oxygen" = 0);
desc = "If you are alive and reading this you should not be in this room and should prob tell a admin how you got here.";
name = "The Paradox Goose"
},
/turf/open/indestructible/hoteltile,
/area/ruin/powered/kinggoat_arena)
"L" = (
/turf/open/indestructible{
icon_state = "silver"
},
/area/ruin/powered/kinggoat_arena)
"M" = (