Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes boxstation grav gen power #51425

Merged
merged 2 commits into from Jun 3, 2020
Merged

Conversation

kriskog
Copy link
Contributor

@kriskog kriskog commented Jun 2, 2020

About The Pull Request

Grav gen APC was hooked to main powernet, which lets it run out of power if engine isnt turned on fast. The not hooked up SMES was also being charged off main powernet, making matters worse. Brings box in line with our other maps, hooking the APC to the SMES in the grav gen room and adding a P.A.C.M.A.N. for emergencies. Buffers it from power sinks, and ensures reliable gravity shiftstart.
Same with the AI core APC, but it was also missing a cable so the APC was just not connected to anything. Very cool, since AI's die without power.

Why It's Good For The Game

People have been complaining about this a lot.

Changelog

🆑 Skoglol
fix: Box gravity generator and AI core APC rewired to smes, will not run out roundstart anymore. P.A.C.M.A.N. added to grav gen for emergencies.
/:cl:

@kriskog kriskog requested a review from ShizCalev as a code owner June 2, 2020 07:05
@tgstation-server tgstation-server added Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated. labels Jun 2, 2020
@Kaffe-work
Copy link
Contributor

based, thanks. also needs to be done for AI apc

@spookydonut spookydonut merged commit 2c2982c into tgstation:master Jun 3, 2020
remove32 added a commit to TheSwain/Fulpstation that referenced this pull request Jun 5, 2020
* Merge TG

* clean up metastation's map, which got mergefucked

* Automatic changelog compile, [ci skip]

* Adds a knockedout trait, begins refactoring mobility 2.0 (tgstation#51348)

* ko

* change request

* Automatic changelog compile [ci skip]

* Fixes Icebox ladders and shuffles around icebox mining. (tgstation#51351)

* Fixes Icebox ladders and shuffles around icebox mining

* Re-applies decals.

* Haha whoops so that's how multiz ladders work,

* Automatic changelog generation for PR tgstation#51351 [ci skip]

* Temporary turf visuals fix. (tgstation#51399)

* [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (tgstation#51252)

* here goes nothing

no really this is basically nothing

* dme is less dumb

* aaaaa string files

* Card backend (#3)

* Adds card backend and hotloading

This is a combination of 2 commits.

OH SHIT THE SM IS ON FIRE

WE DONE LADS

* Woop

* Best we'll get

* fixed file system, courtesy of potato

* updated tools (thanks potato), now up to 40 cards

* Adds rarity (#4)

* Adds rarity

* just to be sure

* Adds it to cards

* Didn't read templates WHAT A NERD AMAROIGHT

* Commets

* Woop you'd think I'd know my own system

* There we go

* Fuck you EOF (#5)

* Makes rarity not suck (#6)

* Fuck you EOF

* Makes rarity not suck

* Auto stash before merge of "blueeyedwhitejumpsuit" and "origin/blueeyedwhitejumpsuit"

* Makes rarity work as expected, thanks dogman (#7)

* smolcards

* Adds datum cards (#8)

* Datum cards

* Some docs and a little bit of cleanup

* fuck

* problems be had

* Fuck (#9)

* fucko bungo RELASE ME FROM THIS HELL GIT

* datum FUCKING AHHHHHHHHHHH

* packs and games

* boomer mood (#10)

* Card debugging (#11)

* Adds debug vars

* that's a bit better

* shit

* unfucks rarity

* scales sorted

* That should do it

* Parity

* fun fact

* series 1 json

* and so it is done

* Don't need this, I'm dumb.

MacRo-Op???@?#?@??!#?!@

* BRAINDAMAGE

* resin redux, smaller cards

* shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad*

* double rarity TABLELS, fixed the silly linter

* flippers and rarities

* guaranteed rarity, rarity tables

* fuck it let's ask

* resinfront

* 2560 core set

* fixes flippers

* template icon, extra variable juice

* ADDS SPEED (#12)

* FUCK FUCK FUCK SHIT I BROKE IT AGAIN

* Kills my dreams in the NAME OF SPEED

* and some cleanup

* Minor changes, some qol (#13)

* couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced

* Let's be more clear,

* and a woooop

* Removing ids, carpel tunnel edittion (#14)

* Subsystem

* Carpel tunnel completed

* woop

* curator is no longer equipment

* I'm not dumb you're dumb (#15)

* minor rarity tweak

ladies and gents, it's finished

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>

* Automatic changelog generation for PR tgstation#51252 [ci skip]

* Removes mutation/chromosomes storage limit from DNA consoles (tgstation#51326)

* Removes mutation/chromosomes storage limit from DNA consoles

* Update tgui.bundle.js

* Automatic changelog generation for PR tgstation#51326 [ci skip]

* Automatic changelog compile, [ci skip]

* Automatic changelog compile [ci skip]

* replaces the mulebot 16 second hardstun with an 8 second knockdown (tgstation#51277)

* F

* Update mulebot.dm

* Automatic changelog generation for PR tgstation#51277 [ci skip]

* light floors emit colored lights (tgstation#51097)

* 1

* 2

* debines

* knojbhgfxychgvjbkn

* better emp (test later)

* alt

* | || || |_

* scewact

* Automatic changelog generation for PR tgstation#51097 [ci skip]

* Removes some dead code (tgstation#51426)

* Automatic changelog generation for PR tgstation#51426 [ci skip]

* Fixes boxstation grav gen power (tgstation#51425)

* Fixes boxstation grav gen power

* And AI sat too

* Automatic changelog generation for PR tgstation#51425 [ci skip]

* Remove DEBUG_ADMIN_HREF from default config (tgstation#51415)

* atmos jumpsuits now have the same protections as engi jumpsuit (tgstation#51243)

* fix (maybe)

* atmos jumpsuits now have the same protections as engi jumpsuit

* gosh i hate plasmem

* hhhnnn

* fuck

* Automatic changelog generation for PR tgstation#51243 [ci skip]

* Update precommit hooks to work in GitHub Desktop (tgstation#51404)

Turns out GitHub Desktop actually does bundle a sh.exe, just not a bash.

Also tries to look for the py launcher to help people who didn't check 
the "Add Python to PATH" option.

* Fixes neckgrabs being only escapable if RNGesus comes down and saves you from your fate (tgstation#51427)

* Fixes grabs being impossible to escape, at the expense of making it easier to escape a grab. Damage inflicted by resisting increased to compensate.

* Upped the time between resists a bit

* Automatic changelog generation for PR tgstation#51427 [ci skip]

* Fixes Get-Current-Logs (tgstation#51376)

* Adds coupons to cargo, turns small crates into goodies (tgstation#51216)

* Adds coupons

* fixes invalid var

* fixes old var name

* test

* does this please you travis?

* is that a prize, or....

* adjusts odds

* fikou owes me $10

* neatens code per review

* corrects bouncy

* corrects some errors

* redisables price gouging on goodies

* Automatic changelog generation for PR tgstation#51216 [ci skip]

* Automatic changelog compile [ci skip]

* fix compile error

* fix icebox slicing issue

Co-authored-by: remove32 <watkinsdakotan@gmail.com>
Co-authored-by: tgstation-server <tgstation-server@tgstation13.org>
Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Kelenius <kelenius@ya.ru>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
AzzyIsNotHere pushed a commit to NTCanadaTeam/NTCanada that referenced this pull request Jun 8, 2020
… (#11)

* [READY]Fixes the horticultural waders sprite. No more hidden hands! (tgstation#51147)

* waders sprite fixed

* fixies for real

* unfucks armor sprite

* Automatic changelog generation for PR tgstation#51147 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile, [ci skip]

* Adds two new modular apps: Lifeline for tracking suit sensors, and the Syndicate-only Fission360 for tracking nuke-related items (tgstation#51152)

About The Pull Request

    Adds two new modular computer programs. Both use the same underlying parts;
    -- Lifeline is an improved suit sensor tracker, showing where the target is on a grid if they're within 24 tiles. The scan button has a two-second delay (since the program has to check every humanoid in glob.human_list for trackability and we don't want that spammed). The app works pretty much how you would expect.
    -- Fission360 uses the same processes as above but for the nuke disk and all nukes in the area (self destruct, beer, syndicate). Available only via emagging a tablet for the moment.
    --
    Rudimentary multiZ support exists, in the form of replacing the crosshairs icon with an up or down arrow (once it's visible within the circle) to indicate if the target is above or below, if both the target and the computer are on a station Z level of some sort. Also, the grid lines are exactly two-tiles apart.

    Added support for programs to list special assets to load, so that we don't have to have every program loading all modular program assets. The radar apps use this to load the background grid and the too-far-away-to-display arrow.

Why It's Good For The Game

More modular apps are good. I'm hoping to see a syndicate-version of the modular tablet in the hands of nuke ops at some point, which is really where Fission360 will make sense. Otherwise, it's an extra tool for traitors with the nuke theft objective, I suppose.
Changelog

cl
add: Two new apps for modular computers are available: Lifeline for Medical, and Fission360 for anyone with access to the Syndicate repository. Lifeline is an improved suit sensors tracker, and Fission360 is the same but for nuclear-related things.
/cl

* Automatic changelog generation for PR tgstation#51152 [ci skip]

* Removes Shotgun Ability (tgstation#51295)

* removes shotgunning

* removes shotgunning

* Automatic changelog generation for PR tgstation#51295 [ci skip]

* Don't throttle TGS commands (tgstation#51292)

* You can altClick to take out DNA Disks from DNA consoles (tgstation#51247)

* You can altClick to take out DNA Disks from DNA consoles

You can now altClick to take out a disk from a DNA Console, instead of having to use the GUI and clicking eject.

* Create eject proc, address code review concerns

* DMDOC additions

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>

* Automatic changelog generation for PR tgstation#51247 [ci skip]

* Makes some tweaks to Icebox's EVA and mining areas. (tgstation#51275)

* Initial changes.

* Oh right, consistancy.

* Automatic changelog generation for PR tgstation#51275 [ci skip]

* Fixing crew monitor suit sensors (tgstation#51268)

* first steps

* Update _under.dm

* time for bug testing

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* more fixes and implementation

* Update crew.dm

* Update clothing.dm

* more bug fixing

* Update crew.dm

* debugging

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* added stuff to nanites

* goddamn nanites

* nanite cleanup

* Update crew.dm

* Update crew.dm

* Automatic changelog generation for PR tgstation#51268 [ci skip]

* Changes the Ancient/Clockwork Spear Sprite. (tgstation#51258)

* Resprites the worst thing ever

* Try again?

* Automatic changelog generation for PR tgstation#51258 [ci skip]

* Adds two new biogenerator chemicals to botany. (tgstation#51304)

* Initial Commit, adds both sidegrade chems.

* Actually lets keep both plants distinct enough, ya know

* Automatic changelog generation for PR tgstation#51304 [ci skip]

* Tiny skill neatness tweaks (tgstation#51309)

* minor neatness tweaks

* topic

* Automatic changelog generation for PR tgstation#51309 [ci skip]

* Fixes scaling names (tgstation#51311)

* Automatic changelog generation for PR tgstation#51311 [ci skip]

* Fixes restricted roles in dynamic with configs.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Improves player retention by leveraging existing assets to incentivize higher average playetime (tgstation#51297)

* im a player ok that means i play

* FINE

* you win this time, shaps

* makes floyd happy

* Update code/__DEFINES/misc.dm

* i was just playing cyberboss dont be mad at me

* changes one character in a comment

* Automatic changelog compile, [ci skip]

* Automatic changelog compile [ci skip]

* remove unnecessary var/id from /datum/material (tgstation#51322)

* remove var/id from /datum/material

* nice commit message dot meme

* Automatic changelog generation for PR tgstation#51322 [ci skip]

* Fixes a small typo (intracies -> intricacies) in _skills.dm (tgstation#51324)

* critical atmos optimization please ignore

* undocumented change lmao

* Automatic changelog generation for PR tgstation#51324 [ci skip]

* Should fix a rare edgecase with explosions and shuttles (tgstation#51017)

* Automatic changelog compile [ci skip]

* Tools for your belt. (tgstation#51328)

* Automatic changelog generation for PR tgstation#51328 [ci skip]

* Glow no longer multiplies it's light strength with power (tgstation#51320)

* Automatic changelog generation for PR tgstation#51320 [ci skip]

* kill featurecoders (tgstation#51319)

* Automatic changelog generation for PR tgstation#51319 [ci skip]

* Alternate directions for arcade machines (tgstation#51313)

* Add files via upload

* Adds directional sprites to arcade machines

* Automatic changelog generation for PR tgstation#51313 [ci skip]

* A few small Cargo bounty tweaks (tgstation#51329)

* Removes the Phazon from the cargo bounty pool.

* Adds a bounty to Cargo requiring a tank of hydrogen

* Automatic changelog generation for PR tgstation#51329 [ci skip]

* Automatic changelog compile, [ci skip]

* OG (tgstation#51156)

Co-authored-by: Tad Hardesty <tad@platymuus.com>

* A fix for botany sprites showing ERRORs. (tgstation#51340)

* I did, I fixed botany forever

* Whoops, still need a min

* Update code/modules/hydroponics/hydroponics.dm

Fair point

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>

* Automatic changelog generation for PR tgstation#51340 [ci skip]

* Adds new body type pref (tgstation#51058)

* tgdb

* tgdb

* Auto stash before cherry pick of "balance changes, enables burn surgery, various body improvements"

* moves unnecessary list out of client

* describes a var

* corrects

* Automatic changelog generation for PR tgstation#51058 [ci skip]

* stray pixel cleanup (tgstation#51338)

* Automatic changelog generation for PR tgstation#51338 [ci skip]

* Automatic changelog compile [ci skip]

* Delays loading of random books (tgstation#51144)

* delays loading of random books

* fix map var

* review

* return

Co-authored-by: Jordie0608 <=>

* Glowshrooms v1.0: Decay, spread "rework" and able to be analyzed (tgstation#51023)

* Added decay for glowshrooms

Glowshrooms now decay after a certain time. Also, reworked spreading algorithm.

* Planted glowshrooms can be analyzed now

* fucking newlines

* YOOOOOOO IT'S REVIEW TIME

* review time v2

* some suggested changes

* new shit

* Automatic changelog generation for PR tgstation#51023 [ci skip]

* Fix Nanite Programmer and Nanite Program Hub deconstruction (tgstation#51245)

* Fix Nanite Programmer and Nanite Program Hub deconstruction

Bug fix for the deconstruction process of the Nanite Programmer and Nanite Program Hub

* Use _act overrides, implement new icons

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>

* Automatic changelog generation for PR tgstation#51245 [ci skip]

* Automatic changelog compile, [ci skip]

* Increase Carp PRice by 1tc (tgstation#51330)

* removes a lot of free illegal tech items (tgstation#51357)

* Automatic changelog generation for PR tgstation#51357 [ci skip]

* Fix unit test logging (tgstation#51354)

* I did myself dirty. (tgstation#51342)

* Boxstation Piping Redone in Layers 1/3 (tgstation#51296)

* Boxstation piping redone

Replaces all of the messy piping on box with layer1/3 pipes, reserving layer 2 for misc work and power lines.

* Changed to fit map alterations

Map changes were integrated into this map.

* Revert "Changed to fit map alterations"

This reverts commit 4114343.

* Added moved AI area/grav gen

Changed map to be most current. Also removed a double cable on one of the upload doors.

* Fixed a small mistake

a slight cable error near the grav gen has been fixed

Co-authored-by: Bennen Sorensen <bennensorensen@gmail.com>

* Automatic changelog generation for PR tgstation#51296 [ci skip]

* Update clothing.dm (tgstation#51337)

* Automatic changelog generation for PR tgstation#51337 [ci skip]

* Automatic changelog compile [ci skip]

* Removes ability to do multiple simultaneous surgeries without Rod of Asclepius (tgstation#51369)

* Automatic changelog generation for PR tgstation#51369 [ci skip]

* removes king goat (tgstation#51366)

* Revert "Remodels king goat ruin (tgstation#50813)"

This reverts commit 26ffe3d.

* numba 1

* bye

* bye 2

* bye 3

* fuck bitches get money

* hey this was actually a good change

* goat sounds

* fuck

* h

* waaaaaaaaagh

* Automatic changelog generation for PR tgstation#51366 [ci skip]

* Better Player Ignore (tgstation#51353)

* Revamp the player ignore system

* Move a variable definition out of a loop

* Replace a |= with +=

* Improve some code

* Fix some code

Co-authored-by: Local <none>

* Automatic changelog generation for PR tgstation#51353 [ci skip]

* Fix achievements subsystem not initializing without the DB (tgstation#51355)

* pink belt fix attempt #2 (tgstation#51327)

h

* Automatic changelog generation for PR tgstation#51327 [ci skip]

* Automatic changelog compile [ci skip]

* Client vars (tgstation#51325)

* fixes grammar (tgstation#51387)

* Firesuits and Radsuits fit the big tanks now (tgstation#51395)

Changed the allowed suit storage items for firesuits and radsuits to allow any internals tank.

* Automatic changelog generation for PR tgstation#51395 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes glow/antiglow (tgstation#51378)

* Fixes glow

* Removes unneeded variable

* Picks random colors

* Applies the lower strength

* Automatic changelog generation for PR tgstation#51378 [ci skip]

* Chunky waddle (tgstation#51383)

* Automatic changelog generation for PR tgstation#51383 [ci skip]

* Copy: Minor changes to sec Hud icons tgstation#50685 (tgstation#51391)

* Incarcerated, warden, psych

* The second half

* Readds doorjack

* Accidentally added an extra doorjack

* Removes stray pixels

Co-authored-by: J? the J man <Zeldin.nick@gmai.com>

* Automatic changelog generation for PR tgstation#51391 [ci skip]

* Automatic changelog compile, [ci skip]

* Adds a knockedout trait, begins refactoring mobility 2.0 (tgstation#51348)

* ko

* change request

* Automatic changelog compile [ci skip]

* Fixes Icebox ladders and shuffles around icebox mining. (tgstation#51351)

* Fixes Icebox ladders and shuffles around icebox mining

* Re-applies decals.

* Haha whoops so that's how multiz ladders work,

* Automatic changelog generation for PR tgstation#51351 [ci skip]

* Temporary turf visuals fix. (tgstation#51399)

* [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (tgstation#51252)

* here goes nothing

no really this is basically nothing

* dme is less dumb

* aaaaa string files

* Card backend (#3)

* Adds card backend and hotloading

This is a combination of 2 commits.

OH SHIT THE SM IS ON FIRE

WE DONE LADS

* Woop

* Best we'll get

* fixed file system, courtesy of potato

* updated tools (thanks potato), now up to 40 cards

* Adds rarity (#4)

* Adds rarity

* just to be sure

* Adds it to cards

* Didn't read templates WHAT A NERD AMAROIGHT

* Commets

* Woop you'd think I'd know my own system

* There we go

* Fuck you EOF (#5)

* Makes rarity not suck (#6)

* Fuck you EOF

* Makes rarity not suck

* Auto stash before merge of "blueeyedwhitejumpsuit" and "origin/blueeyedwhitejumpsuit"

* Makes rarity work as expected, thanks dogman (#7)

* smolcards

* Adds datum cards (#8)

* Datum cards

* Some docs and a little bit of cleanup

* fuck

* problems be had

* Fuck (#9)

* fucko bungo RELASE ME FROM THIS HELL GIT

* datum FUCKING AHHHHHHHHHHH

* packs and games

* boomer mood (#10)

* Card debugging (#11)

* Adds debug vars

* that's a bit better

* shit

* unfucks rarity

* scales sorted

* That should do it

* Parity

* fun fact

* series 1 json

* and so it is done

* Don't need this, I'm dumb.

MacRo-Op???@?#?@??!#?!@

* BRAINDAMAGE

* resin redux, smaller cards

* shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad*

* double rarity TABLELS, fixed the silly linter

* flippers and rarities

* guaranteed rarity, rarity tables

* fuck it let's ask

* resinfront

* 2560 core set

* fixes flippers

* template icon, extra variable juice

* ADDS SPEED (#12)

* FUCK FUCK FUCK SHIT I BROKE IT AGAIN

* Kills my dreams in the NAME OF SPEED

* and some cleanup

* Minor changes, some qol (#13)

* couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced

* Let's be more clear,

* and a woooop

* Removing ids, carpel tunnel edittion (#14)

* Subsystem

* Carpel tunnel completed

* woop

* curator is no longer equipment

* I'm not dumb you're dumb (#15)

* minor rarity tweak

ladies and gents, it's finished

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>

* Automatic changelog generation for PR tgstation#51252 [ci skip]

* Removes mutation/chromosomes storage limit from DNA consoles (tgstation#51326)

* Removes mutation/chromosomes storage limit from DNA consoles

* Update tgui.bundle.js

* Automatic changelog generation for PR tgstation#51326 [ci skip]

* Automatic changelog compile, [ci skip]

* Automatic changelog compile [ci skip]

* replaces the mulebot 16 second hardstun with an 8 second knockdown (tgstation#51277)

* F

* Update mulebot.dm

* Automatic changelog generation for PR tgstation#51277 [ci skip]

* light floors emit colored lights (tgstation#51097)

* 1

* 2

* debines

* knojbhgfxychgvjbkn

* better emp (test later)

* alt

* | || || |_

* scewact

* Automatic changelog generation for PR tgstation#51097 [ci skip]

* Removes some dead code (tgstation#51426)

* Automatic changelog generation for PR tgstation#51426 [ci skip]

* Fixes boxstation grav gen power (tgstation#51425)

* Fixes boxstation grav gen power

* And AI sat too

* Automatic changelog generation for PR tgstation#51425 [ci skip]

* Remove DEBUG_ADMIN_HREF from default config (tgstation#51415)

* atmos jumpsuits now have the same protections as engi jumpsuit (tgstation#51243)

* fix (maybe)

* atmos jumpsuits now have the same protections as engi jumpsuit

* gosh i hate plasmem

* hhhnnn

* fuck

* Automatic changelog generation for PR tgstation#51243 [ci skip]

* Update precommit hooks to work in GitHub Desktop (tgstation#51404)

Turns out GitHub Desktop actually does bundle a sh.exe, just not a bash.

Also tries to look for the py launcher to help people who didn't check 
the "Add Python to PATH" option.

* Fixes neckgrabs being only escapable if RNGesus comes down and saves you from your fate (tgstation#51427)

* Fixes grabs being impossible to escape, at the expense of making it easier to escape a grab. Damage inflicted by resisting increased to compensate.

* Upped the time between resists a bit

* Automatic changelog generation for PR tgstation#51427 [ci skip]

* Fixes Get-Current-Logs (tgstation#51376)

* Adds coupons to cargo, turns small crates into goodies (tgstation#51216)

* Adds coupons

* fixes invalid var

* fixes old var name

* test

* does this please you travis?

* is that a prize, or....

* adjusts odds

* fikou owes me $10

* neatens code per review

* corrects bouncy

* corrects some errors

* redisables price gouging on goodies

* Automatic changelog generation for PR tgstation#51216 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog generation for PR tgstation#51333 [ci skip]

* Fixes Pest/Weed Killer so that they don't act like hypertoxins, adds organic weedkiller to compensate. (tgstation#51293)

* Initial Commit.

* Fineeeeeee, added sanity check.

* Alright, nerfed according to corn on the cobby

* Automatic changelog generation for PR tgstation#51293 [ci skip]

* DMAPI 5.2.2 (tgstation#51100)

* Update DMAPI to v5.1.0

* Add more event handlers

* Patch

* DMAPI 5.2.0

* DMAPI 5.2.1

* Add missing trailing new line

* Fix the version we print after updates

* 5.2.2

* Automatic changelog compile, [ci skip]

* Supresses icon2html runtime spam. (tgstation#51438)

* replaces plasma in bluespace beaker with plastic (tgstation#51437)

* replaces diamonds in bluespace beaker with plastic

* ok cobert c chemicals

* Automatic changelog generation for PR tgstation#51437 [ci skip]

* Automatic changelog compile, [ci skip]

* Automatic changelog compile [ci skip]

* illustrious (tgstation#51418)

* Automatic changelog generation for PR tgstation#51418 [ci skip]

* I was bored (tgstation#51407)

* Automatic changelog generation for PR tgstation#51407 [ci skip]

* Fixes multiz lag. (tgstation#51454)

* Automatic changelog generation for PR tgstation#51454 [ci skip]

* Documents browserOutput.dm (tgstation#51439)

* Fixes sensors runtime. (tgstation#51445)

* Adds some card unit tests, cleans up some comments (tgstation#51434)

* Adds unit tests, some more checks, and improves some comments

* sweep sweep sweep?

* Braindamage

* Automatic changelog generation for PR tgstation#51434 [ci skip]

* Automatic changelog compile, [ci skip]

* Fixes turf atmos getting deleted. (tgstation#51453)

* Fixes turf atmos getting deleted.

* Moves the gas transfer procs to the gas mixture.

* Fixes emp act to behave like before

* Fixes tanks exploding

* Minor circle hand fixes (tgstation#51276)

* love being "the circle game" person now

* most useless flag ever

* Automatic changelog generation for PR tgstation#51276 [ci skip]

* Changeling on changeling absorb fix (tgstation#51444)

* adds changeling vars

needed due to changeling that absorbs a changeling that absorbs a changeling getting more chems

* Update changeling.dm

changes reset_properties() to reflect things that sohuldn't reset to baseline - this is not pretty

* fix spell error

* spelling error

* add some comment on why change was done

This really speaks for itself in my opinion

* Automatic changelog generation for PR tgstation#51444 [ci skip]

* Automatic changelog compile [ci skip]

* Fixes canister pain (tgstation#51074)

* fixes dumb canister shit

* Thanks anturk

* That good?

* moves the base icon state to the object def

* Automatic changelog generation for PR tgstation#51074 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile, [ci skip]

* improves dynamic ruleset scaling code (tgstation#51385)

* awful

dynamic code sucks ass

* distributive property

removes antags_rolled entirely. good riddance

* Automatic changelog generation for PR tgstation#51385 [ci skip]

* Some cleanup (tgstation#51315)

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Automatic changelog generation for PR tgstation#51315 [ci skip]

* Dynamic hotfix (tgstation#51502)

* Dynamic hotfix

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* this was a dumb error

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Automatic changelog generation for PR tgstation#51502 [ci skip]

* Automatic changelog compile, [ci skip]

* Automatic changelog compile [ci skip]

* Adds arguments to the rest of make_plating procs. (tgstation#51460)

* Replace BSQL with rust-g, paramaterize all queries (tgstation#51255)

cl
refactor: BSQL has been replaced with rust-g, improving SQL reliability and safety.
/cl

Queries were parameterized as much as possible. Careful code read by someone else also versed in SQL would be a good idea. Things seemed fine spot-testing roundstart, library, bans, and polls, but more stress-testing may be useful.

Also updates rust-g to v0.4.5:

    Improved Linux .so detection
    Perlin noise functions

Also updates Travis script to bionic.

* Automatic changelog generation for PR tgstation#51255 [ci skip]

* Automatic changelog compile, [ci skip]

* update_static_data now passes user to push_data() (tgstation#51485)

update_static_data now passes user to push_data().

I'm pretty sure no UIs currently use user in ui_static_data for... Anything. So that's why no one noticed this before. Well, better to pass it than not.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@tgstation13.org>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: KathyRyals <65850818+KathyRyals@users.noreply.github.com>
Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MacBlaze1 <33578623+MacBlaze1@users.noreply.github.com>
Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: TheChosenEvilOne <tceo-email@protonmail.com>
Co-authored-by: MrDoomBringer <mrdoomboyo@gmail.com>
Co-authored-by: William Wallace <me@wiox.me>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: AsphaltEvidence <64790412+AsphaltEvidence@users.noreply.github.com>
Co-authored-by: TheVekter <TheVekter@users.noreply.github.com>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com>
Co-authored-by: Shadark <fauglir@gmail.com>
Co-authored-by: GhostEcho <34822121+GhostEcho@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Helianthus00 <64755361+Helianthus00@users.noreply.github.com>
Co-authored-by: Bennen Sorensen <bennensorensen@gmail.com>
Co-authored-by: PrimordialOoze <65879488+PrimordialOoze@users.noreply.github.com>
Co-authored-by: Fhaxaris <Chrisamcculler@gmail.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: BeeSting12 <zvmallol@gmail.com>
Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: J? the J man <Zeldin.nick@gmai.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Kelenius <kelenius@ya.ru>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Kaffe-work <leoo@student.chalmers.se>
Co-authored-by: tmtmtl30 <53132901+tmtmtl30@users.noreply.github.com>
Co-authored-by: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>
Co-authored-by: Trigg <36010999+TriggeredBoi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Rewrites a bug so it appears in different circumstances Map Edit Thank you for your tile-placing service. It's always appreciated.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants