Skip to content
This repository has been archived by the owner on Jun 7, 2022. It is now read-only.

[MIRROR] [s] Fixing an infinite loop exception with Move() (#57895) #730

Merged
merged 2 commits into from
Mar 27, 2021

Conversation

aquila33-bot
Copy link
Collaborator

Original PR: BeeStation/BeeStation-Hornet#3954

Requested mirror of tgstation/tgstation#57895
@ ike709

@srawek srawek merged commit 38bff62 into master Mar 27, 2021
@srawek srawek deleted the upstream-merge-3954 branch March 27, 2021 16:59
srawek pushed a commit that referenced this pull request Mar 29, 2021
…730)

* [s] Fixing an infinite loop exception with Move() (#57895) (#3954)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* [s] Fixing an infinite loop exception with Move() (#57895)

Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
srawek added a commit that referenced this pull request Mar 29, 2021
* Stat panel updates

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* [MIRROR] Meteor wave changes. (#709)

* Meteor wave changes. (#3781)

* Update meteor_wave.dm

* bop you died

* Update asteroid_impact.dm

Co-authored-by: PowerfulBacon <>

* Meteor wave changes.

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

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

* [MIRROR] Non-bitflag slot defines removal (#710)

* Non-bitflag slot defines removal (#3300)

* INITIAL

* Correct bm.dm

* PROBE AND REPLACE

* correct am.dm

* l

* Revert "hrm"

This reverts commit 682c45ad7a84248ccd9205d4ce0379f5ac7fdb94.

* fix mistake in update_icons i forgot to commit and push

* PARTE23

* I used webedit. I am a terrible human being. Now it will compile again.

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

Co-authored-by: Xenomedes <park246824@ gmail.com>

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

Co-authored-by: Xenomedes <park246824@ gmail.com>

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

Co-authored-by: Xenomedes <park246824@ gmail.com>

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

Co-authored-by: Xenomedes <park246824@ gmail.com>

* do the thing

* Update squidpeople.dm

* first

* ok the computer isn't going to help me

* c

Co-authored-by: Xenomedes <park246824@ gmail.com>
Co-authored-by: Sinestia <lul>

* Non-bitflag slot defines removal

* Update loadout_donator.dm

wtf

Co-authored-by: Sinestia <40812746+Sinestia@users.noreply.github.com>
Co-authored-by: Xenomedes <park246824@ gmail.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

* [MIRROR] Ports tgui lists (#711)

* Ports tgui lists (#3366)

* init

Co-Authored-By: Watermelon914 <37270891+Watermelon914@ users.noreply.github.com>

* adds usage

Co-Authored-By: Watermelon914 <37270891+Watermelon914@ users.noreply.github.com>

* switches more lists to using tgui

* stuffs

* fix lmao

* more stuffs uses the thing

* fix

* fix1

* search

* rebuild

* remove stuffs that don't work

* blegh

* that works?

Co-authored-by: Watermelon914 <37270891+Watermelon914@ users.noreply.github.com>

* Ports tgui lists

Co-authored-by: LatteKat <56778689+jupyterkat@users.noreply.github.com>
Co-authored-by: Watermelon914 <37270891+Watermelon914@ users.noreply.github.com>

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

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

* [MIRROR] Replaces the spectre inspector's ability to see all ghosts with a team locator that points to the position of all ghosts. (#712)

* Replaces the spectre inspector's ability to see all ghosts with a team locator that points to the position of all ghosts.

* Update ghost.dm

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

* [MIRROR] Bullet primer x screwdriver (#713)

* Bullet primer x screwdriver (#3607)

* boom, headshot

* no more arrow primer hitting

* hurty hands

* fixes runtime

* checks for shells inhand

* limb damage fix

* Bullet primer x screwdriver

Co-authored-by: TheFakeElon <59686430+TheFakeElon@users.noreply.github.com>

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

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

* [MIRROR] adds the geisha suit to the beecoin shop (#714)

* adds the geisha suit to the beecoin shop (#3644)

adds the geisha suit to the beecoin shop. 20,000 beecoins.

* adds the geisha suit to the beecoin shop

Co-authored-by: yyzsong <65325586+yyzsong@users.noreply.github.com>

* [MIRROR] Makes automatic shotguns heavy weapons (#715)

* Update shotgun.dm (#3646)

Co-authored-by: PowerfulBacon <>

* Makes automatic shotguns heavy weapons

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>

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

* [MIRROR] Prevents indestructable items from being destroyed 2. (#716)

* Prevents indestructable items from being destroyed 2. (#3655)

* Update destructive_analyzer.dm

* Update supermatter.dm

Co-authored-by: PowerfulBacon <>

* Prevents indestructable items from being destroyed 2.

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>

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

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

* [MIRROR] Energy katana gets deleted when the ninja dies. (#717)

* Energy katana gets deleted when the ninja dies. (#3664)

* Energy katana

* Update suit.dm

Co-authored-by: PowerfulBacon <>

* Energy katana gets deleted when the ninja dies.

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>

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

* [MIRROR] Tweaks contraband prices for cargo (#718)

* Tweaks contraband prices for cargo (#3679)

* Update packs.dm

- makes spec ops crate viable for lone traitors

* Update packs.dm

- reduce null goodies slightly

* Revert "Update packs.dm"

This reverts commit c846756b93875c19cddc4d77aca5e2ac3afb907c.

* Tweaks contraband prices for cargo

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

* [MIRROR] Quick-Create-Antagonist tweaks (#719)

* Quick-Create-Antagonist tweaks (#3950)

* traitor count

* more antags + logs

* cult and other changes

* changed to maxCount to be generic

* Quick-Create-Antagonist tweaks

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

* [MIRROR] Adds Yatzy (#720)

* Adds Yatzy (#3744)

* implement

* yahtzee > yatzy

* Update toys.dm

* Adds Yatzy

Co-authored-by: eeSPee <robotdevilinside@gmail.com>

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

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

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

* [MIRROR] Deltastation third brig cell (#721)

* Deltastation third brig cell (#3746)

* Most changes done, needs testing (and probably more changes)

* Moved rooms around and area fixes

* Mostly working, mail needs testing

* Fixes access to gulag and security office

* Added lacking nearstation space area

* Something idk

* Mostly done, needs testing

* Unfucked interrogation door, moved few things

* Looks good, also tested

* Changed access to some doors

* Emergency locker

* test

* Added missing wire to the third cell

* Adds some striped line decals

* amazing

* Deltastation third brig cell

Co-authored-by: Mat05usz <luczynski.mateusz05@gmail.com>

* [MIRROR] Adds Chess Crates and a Maints Chess Room (#722)

* Adds Chess Crates and a Maints Chess Room (#3763)

* spess chess

* Update sk_rdm157_chess.dmm

* Update sk_rdm157_chess.dmm

* general fixes

* changelog

* Update cardboard_cutouts.dm

* Update packs.dm

* last one I swear

* centcom chess + remove cutout kit

* oops

* fix dirs

* Adds Chess Crates and a Maints Chess Room

Co-authored-by: eeSPee <robotdevilinside@gmail.com>

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

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

* [MIRROR] TG PORT: New sprite animation (#723)

* ok then (#3789)

* TG PORT: New sprite animation

Co-authored-by: Autisem <36102060+Autisem@users.noreply.github.com>

* [MIRROR] Oozeling Tweak: Increase cost of limb regen, make limbs recede sooner (#724)

* Increase cost of limb regen + makes limbs recede sooner. (#3942)

* Oozeling Tweak: Increase cost of limb regen, make limbs recede sooner

Co-authored-by: Rukofamicom <riskbreakerfamicom2@gmail.com>

* [MIRROR] Sec Cell Logging (#725)

* Sec Cell Logging (#3948)

* user panel logs

* remove defines, grammar

* last review

* Sec Cell Logging

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

* Bump pillow from 7.1.0 to 8.1.1 in /tools/mapmerge2 (#726)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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

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

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

* Przeniesienie game_options.txt (#661)

* game options 1

* Revert "game options 1"

This reverts commit f81e4ab.

* poprawka opcji

* tryby gry bazowane (based) na ilosci graczy

* Update game_options.txt

Co-authored-by: JacekPlacek7312 <55637464+JacekPlacek7312@users.noreply.github.com>

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

* Master moment (#727)

Co-authored-by: TheFakeElon <59686430+TheFakeElon@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

* Fixes 2% egg not deleting on completion (#729)

Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

* [MIRROR] [s] Fixing an infinite loop exception with Move() (#57895) (#730)

* [s] Fixing an infinite loop exception with Move() (#57895) (#3954)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* [s] Fixing an infinite loop exception with Move() (#57895)

Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Fixes drone DoUnequip (#731)

Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>

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

* fix tgui

* fix tgui

Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
Co-authored-by: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Co-authored-by: jackpie <55637464+jack-pie@users.noreply.github.com>
Co-authored-by: Sinestia <40812746+Sinestia@users.noreply.github.com>
Co-authored-by: Xenomedes <park246824@ gmail.com>
Co-authored-by: LatteKat <56778689+jupyterkat@users.noreply.github.com>
Co-authored-by: Watermelon914 <37270891+Watermelon914@ users.noreply.github.com>
Co-authored-by: TheFakeElon <59686430+TheFakeElon@users.noreply.github.com>
Co-authored-by: yyzsong <65325586+yyzsong@users.noreply.github.com>
Co-authored-by: bloons3 <bloons3@users.noreply.github.com>
Co-authored-by: eeSPee <robotdevilinside@gmail.com>
Co-authored-by: Mat05usz <luczynski.mateusz05@gmail.com>
Co-authored-by: Autisem <36102060+Autisem@users.noreply.github.com>
Co-authored-by: Rukofamicom <riskbreakerfamicom2@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JacekPlacek7312 <55637464+JacekPlacek7312@users.noreply.github.com>
Co-authored-by: Gallyus <5572280+francinum@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants