TGU #12
Merged
TGU #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was previously using afterattack()
Makes the .45 magazine actually update per round rather than just showing full or empty.
* Return of the Ass * One last commit, master... * spring cleaning
* VERIFIED golem buff * Oops wrong proc * Annnd the description mentioning this.
This was previously using afterattack()
* (deriuqer) yrammuS * Also this * Guess I'll do it this way, then * You can hit the arms now, too * Update code/game/mecha/mecha.dm requested by ShizCalev, committed by Zxaber Co-Authored-By: zxaber <37497534+zxaber@users.noreply.github.com> * Update mecha.dm * commited a comment
* fixes it for real * possible
Removed unlawful reference to Disney's Star Wars franchise in map logging.
* updated robocop.mp3 quality * hurr durr im appveryor and im of low mental capacity, to the extent that a certain r word would be frequently used to describe me * using original file that is potentially better quality while being a tiny amount smaller.
* allows byond members to bypass pop cap * fix * new line
Adds laceup shoes to curator's outfit.
* paraplegic vehicle fixes * im on a boat
…yer panel (#43427) * fixes secrets topic check_antagonist * removes code related to check_antagonist topic that doesn't work or does nothing * changes the name of the button in the secrets panel * removes old secrets panel topic check_antagonist * player panel antag button no longer relies on secrets topic * player panel antag button no longer relies on secrets topic * readds something i shouldnt have removed
* 1 * 2 * finall pre pr * oof * oof * testing merge conflict fix * test mk2 * test mk3 * plant & chem * bvcgr * fixed stuff * grammar stuff * fixes clothing + cobby bribe * new sprites by wjohn * Update code/modules/clothing/suits/armor.dm Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> * tweaks .38 stuff * Update code/modules/cargo/packs.dm Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> * nuclear option
INCREDIBLY CRUCIAL BUGFIX IF IS NOT OF BUT NOW IT IS
The War on Stun Based Combat Phase II About The Pull Request A massive change in gameplay that affects more than just disarm. Hopefully in an interesting way. There's two parts to this, part 1 is that disarm's functionality has been entirely stripped out and replaced with essentially a new purpose: Shoving. Shoving is the new action that occurs when clicking on people while in the disarm intent. Shoving someone pushes them one tile away from you. If there is otherwise nothing blocking them, they are slowed down very slightly for 3 seconds. If you shove someone again while they are slowed, it knocks ranged weapons out of their active hand. I'm not sure about this part and may buff or remove it depending on how it works in practice. If the blocking tile has a table on it, they're pushed onto it knocking them over for 3 seconds. If it has another human on it, it knocks them both over, the collateral victim for 1 second instead of 3. If the tile is otherwise blocked besides them, it knocks them down for 3 seconds. All knockdowns cause you to drop items, and do not stun at all and can be immediately crawled away from. However, once knocked down, if you are shoved again it paralyzes for 4 seconds. This is the same length as the old disarm push. It cannot be chained or extended, shoving them again while they're paralyzed does not extend the length of the paralyze. Once it ends, the person will be up and moving. Now you might be thinking, why would I want to shove someone unless they're against a wall? Here's part 2: Moving into someone in a hostile intent no longer pushes them. They'll stay where they are and your movement is blocked. If you want to get someone out of the way, you need to shove them. Why It's Good For The Game Changes a previously RNG based mechanic that was basically just spammed until you got that lucky "I win" roll into a positioning based utility that has a point to use in many situations. Livens up simple melee combat and makes fighting in confined areas more lively and unpredictable. Introduces some new epic gamer strats, I've been playing around and it's pretty fun. Also why not try something really crazy and see what happens? If it's shit it can be reverted :^) Changelog Special thanks to whoneedsspace, the inventor of the singlecap, for deshitcodifying this hard. cl add: Disarm has been reworked, instead of an rng based system instead it pushes people away from you. If their movement is blocked it knocks them over. Shoving someone twice quickly will knock ranged weapons out of their hands. del: Moving into humans while in a hostile intent no longer pushes them. tweak: Passive grabs need to be resisted out of while on the ground, and can't be directly crawled out of /cl
fixes clown suit datum runtime
TheSwain
pushed a commit
that referenced
this pull request
Jul 24, 2019
* Initial work * more * ass * wsedfwedff * asss * test * stuff * fuck * sss a * kms * asdadwedwdfwefwef * start * test * dwwdew * ewefwfef * Redemption machine (#8) * Redemption machine * Removes debug messages * changes * fuckmyshitup * coin mint works with new material shenanigans (#10) * Auto stash before merge of "materials" and "origin/materials" * woops * furnace (#11) * autolathe manufacturing of toolboxes * eggs in a basket * some small changes * matcolors * documentation * more documentation and effects * done * Color man bad (#12) * fixes designs * ass * more fixes * fuck me * firestacks adder * epic fixes * fixes designs * DONE DIDDILY DOO * removes category macro * ch-ch-ch-changes * fixes some stuff * Fixes display of ore values (#9) * Redemption machine * Removes debug messages * Re-adds value display * Replaces the fire stacking component with an element instead (#13) * fixes examine * fixes ligma bugs * double ligma boofus * fix * misses some defines * fixes ORM * Update code/datums/components/material_container.dm Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com> * fixes * Makes glass objects weaker (#14) * Makes glass objects weaker * uses correct proc * fixes shit * honk honk * better * oh shit oh fuck * fixes * fuck ORMs * fixes the biogen * documentation * ass (#15) * component * changes * ass * ass * doc * Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent" * fixes rounding * fixed
TheSwain
pushed a commit
that referenced
this pull request
Feb 25, 2020
remove32
pushed a commit
that referenced
this pull request
Jun 4, 2020
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>
remove32
added a commit
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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Why It's Good For The Game
Changelog
🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl: