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

this better not be on the main branch instead of my fork or else I am… #733

Closed
wants to merge 1 commit into from

Conversation

Freudeheit
Copy link

… going cry and scream (#1)

Reduced the material cost for pipebows and time to craft silk form cotton on the loom

  • Bows sprite adjustment

Adjusted the sprite of the unloaded bow to make the space between the bow and bowstring valid space when reloading

This reverts commit 4e4faae.

tgstation/tgstation#45217

  • Port "Fixes orbit offsets and adds matrix vv preview." from TG

tgstation/tgstation#51198

Co-authored-by: AnturK [email protected]

can't blind through walls

  • laser pointer 2

combine the if check

  • Revert "laser pointer 2"

This reverts commit dd9f61b5bf9a99096a94179875ad13dd9b487aeb.

  • laser 3

using can_see now

  • changing values

changing from 7 to 6 as can_see 7 increase the range by 1

you now no longer spawn as a human

This just makes flypeople available at roundstart again.

Co-authored-by: Dennok [email protected]

ahaha

  • Add files via upload

  • Add files via upload

  • Delete mining_machines.dmi

  • Delete STFUHAYDEN.ogg

  • Delete mining_machines.dmi

  • Add files via upload

  • changed sprotes

changed so the bs miner uses its own sprite

Co-authored-by: MrDoomBringer [email protected]

  • Alive players can now hear dead players when the round is over

Co-authored-by: MrDoomBringer [email protected]

Co-authored-by: MrDoomBringer [email protected]

  • Admin verb reorganization + extra (DNA console upstream fix #1856)

  • missed one

  • feedback from the bees

  • since I'm here, why not

  • admin verb reorganization + 1 fix

  • get rid of those new era comments, we in the big bee now

  • ACTUALLY feedback from the bees (git derp)

  • edit objective from team panel

  • check teams is now an admin verb

  • bye bye leftover comment

  • Revert gold necklace name in beecoin shop (Squads 3! #1924)

  • Revert gold necklace beecoing shop name

  • fix

beecoin shop now has two names for gold necklace: 'dope necklace' and 'necklace, gold'

Co-authored-by: Emmanuel S. [email protected]

  • Move ghosts below alive

  • Rebuild tgui.bundle

  • Update as per stylemistake's feedback

  • Cosmetic stuff

  • Rebuild tgui

  • Replace localeString with faster alternative

  • Update tgui.bundle.js to latest upstream

  • Hitting enter in the search bar will now snap you to orbit the most relevant result

Co-authored-by: Emmanuel S. [email protected]
Co-authored-by: Aleksej Komarov [email protected]

  • rebuilt

  • dme

  • Adds scroll bar to ghost Orbit menu (#51681)

  • Add scroll bar to ghost orbit menu

  • Rebuild TGUI

  • rebuild

Co-authored-by: Emmanuel S. [email protected]
Co-authored-by: Aleksej Komarov [email protected]

Co-authored-by: Bobbahbrown [email protected]

Co-authored-by: kevinz000 [email protected]
Co-authored-by: skoglol [email protected]

Co-authored-by: Bobbahbrown [email protected]

Co-authored-by: deathride58 [email protected]

Co-authored-by: Crossedfall [email protected]

  • [Port] BSQL Replacement (AI Shell and Ion Laws #2038)

  • Pass 1

  • Reverts poll changes and removes sanitize calls

  • Removes duplicate definition from IsBanned

  • Pass 2

  • Thiccens rust-g with all the additional features.

  • Re-adds extools to Travis

  • Remove BSQL_DEBUG config option (#51508)

Leftover code does nothing now.

(cherry picked from commit 5a319257fd8e04539846d794538077bacb0fb037)

  • first round of rbsql/brsql fixes (#51517)

(cherry picked from commit 0bc58c667d0854c17ea8be00b4a3c60bc8e68ec3)

  • Resets poll.dm and new_player.dm to master

  • Correctly updates poll and new_player

  • Pass 3

  • mentor qdel additions

  • Fixes my sloppy copy paste job

  • Fixes the death insertion query

Co-authored-by: Tad Hardesty [email protected]
Co-authored-by: Jordie [email protected]
Co-authored-by: Kyle Spier-Swenson [email protected]

(cherry picked from commit 9b6457f770fb5c7440c5c7bf8ae9bc0f88c6d21b)

Co-authored-by: Bobbahbrown [email protected]

Co-authored-by: u6104537 [email protected]

Co-authored-by: u6104537 [email protected]

Honkferatu ruin now has a closet with 30 bananium ores. (More in line with other )

reverts the 10x damage spite PR from tg that makes meth unusable

Nothing

  • ts7

  • Automatic changelog generation for PR cargo suply manifests do not always have the correct ship name in the destination section #2001 [ci skip]

  • Automatic changelog generation for PR Moving up/down Z-levels while in fighter ejects while allowing you to still control the fighter #2076 [ci skip]

  • Automatic changelog compile [ci skip]

  • Ports hat throwing from TG (Randomized Round-Start Names for Voidcrafts #1952)

  • Adds SNUG_FIT & EFFECT__HAT bitfields and object flags. Adds target_zone var to thrownthing

  • Refactors obj_flags.dm, lines have consistent tabbing for readability

  • hat knocking code, including SNUG_FIT and EFFECT_HAT obj flag checks. All thanks to MMMiracles and tgstation

  • Adds SNUG_FIT and EFFECT_HAT clothing flags to all appropriate headgear

  • Adds SNUG_FIT to hardsuit helmets, whoops

  • Don't need all these extra SNUG_FIT flags, they're already there from _spacesuits.dm

  • adds SNUG_FIT to hoods, cloaks, and wizard hats. note: This means all real and fake wizard hats can't be knocked

  • Final batch, doing one last /obj/item/clothing/head sweep

  • Final scouring for required SNUG_FIT and EFFECT_HAT instances

  • Drone hats get SNUG_FIT, peaceflower gets EFFECT_HAT

  • adds SNUG_FIT to tinfoil hats, tinfoil envirohelmets, and peace flowers. they shouldn't be easy to remove

  • Adds a few missing span ends

  • Prevents all wearable non-clothing objects from being knocked off by other hats

  • Don't do this to me Travis

  • Automatic changelog generation for PR Randomized Round-Start Names for Voidcrafts #1952 [ci skip]

  • Automatic changelog compile [ci skip]

  • Automatic changelog compile [ci skip]

  • MiningMonstermosCompliance FOB and Roci

  • Deleting APC

  • A change to stand's healing ability (Ports The Multi-Cell Charger #1965)

It seems the intention was to have healing while not deployed to be a third of healing while deployed but no less than two. But because heals variable is negative, max(heals * 0.5, 2) always returns a value of 2 and so healing while not deployed deals 2 damage across the board.

The change will bring this to what I assume was the intention. That is, 1/3 heal from the inside but no less than 2.

I will also make another PR in case stand is only supposed to heal while deployed. Because damaging the stand user in healing mode should not be a thing.

Shoutout to ike for informing me about this mystical program

  • Map Merging P2

  • Map Merging P3

  • Map Merging P4

  • Map Merging P5 (Attempting to replace)

  • I think this is why the error exists

  • Fixing 1/2 of the last bug

  • Im a fucking spaz

forgot to change one of the uniforms and instead changed the mining boots instead

  • I am a fucking spaz Part 2

I forgot to #include the vending machine file

  • Windows didn't have plating under them

  • Added a first aid kit to the space shelter

  • Medical tent didn't have a fan

  • Moving the fans P1

Bacon said their main purpose was to block atmos flow and putting them in the middle of rooms wouldn't do that

  • Moving the fans P2

  • Forgot that the old map had the shitty filepath

  • 7500 bro really das too much

Dropped the price of the camp capsule from 7500 to 5000

  • Added a sign for the medical tent

  • Adds sign code

  • Medical and Engineering get signs

  • Party 1

  • Party 2

  • Sprite change + Party 3

  • Party 3 + Sprites

  • Party 4

  • Medical Capsule isn't as neon now

  • Fixing some text that looked bad

  • Little text update to restart the build checker

  • Updating the sign text

  • Forgot a few fans

  • Forgot a few fans 2

  • Changing reinforced windows to normal windows

By request of Zesko

This is the only way we'd be able to do secrets in practice
Shit like this is why I'd rather rebase to goon and lose every last drop of
progress before I support broad use of that strategy.

Co-authored-by: ss13-beebot [email protected]
Co-authored-by: zeskorion [email protected]
Co-authored-by: Mick1299 [email protected]
Co-authored-by: Cenrus [email protected]
Co-authored-by: Flakkyboo [email protected]
Co-authored-by: St0rmC4st3r [email protected]
Co-authored-by: PowerfulBacon [email protected]
Co-authored-by: Vasily2013 [email protected]
Co-authored-by: ike709 [email protected]
Co-authored-by: Trigg [email protected]
Co-authored-by: AnturK [email protected]
Co-authored-by: Crossedfall [email protected]
Co-authored-by: Ayy-Robotics [email protected]
Co-authored-by: WirelessWarlock [email protected]
Co-authored-by: Jesusaholy1 [email protected]
Co-authored-by: Kmc2000 [email protected]
Co-authored-by: Dennok [email protected]
Co-authored-by: BettonnCZ [email protected]
Co-authored-by: MrDoomBringer [email protected]
Co-authored-by: Sinmero [email protected]
Co-authored-by: Aleksej Komarov [email protected]
Co-authored-by: Bobbahbrown [email protected]
Co-authored-by: kevinz000 [email protected]
Co-authored-by: skoglol [email protected]
Co-authored-by: That0nePerson [email protected]
Co-authored-by: deathride58 [email protected]
Co-authored-by: Tad Hardesty [email protected]
Co-authored-by: Jordie [email protected]
Co-authored-by: Kyle Spier-Swenson [email protected]
Co-authored-by: Matthew Longman [email protected]
Co-authored-by: Dingo-Dongler [email protected]
Co-authored-by: u6104537 [email protected]
Co-authored-by: xboxnoob [email protected]
Co-authored-by: yorii [email protected]
Co-authored-by: Gallyus [email protected]
Co-authored-by: Archanial [email protected]
Co-authored-by: Goat Monarch [email protected]
Co-authored-by: GoatMonarch [email protected]
Co-authored-by: Sergei [email protected]
Co-authored-by: Ravellon [email protected]

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:

… going cry and scream (#1)

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* fixes a runtime in experimental diseases (#1959)

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

* Automatic changelog compile [ci skip]

* Fixes hermit doctor and legion cultist outfits (#1955)

* Fixes lavaland hermit spawning with a broken uniform

* Fixes cult legion corpse spawning with a broken exosuit

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

* Automatic changelog compile [ci skip]

* initial (#1921)

* Automatic changelog compile [ci skip]

* Pipebow balance (#1925)

* Pipebow balance

Reduced the material cost for pipebows and time to craft silk form cotton on the loom

* Bows sprite adjustment

Adjusted the sprite of the unloaded bow to make the space between the bow and bowstring valid space when reloading

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

* Automatic changelog compile [ci skip]

* [TG PORT] [s] fixes a href exploit on shuttle computer code (#1974)

* fixed

* Fixes the oversight of the original PR.

* Fixes the same thing on the custom shuttles.

* sfw bee ghosts (#1977)

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

* Automatic changelog compile [ci skip]

* Revert "Xenolings are obtainable again and no longer broken OP (#1886)" (#1971)

This reverts commit 4e4faae.

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Directional Airlock Cycle Controllers (#1983)

* Directional Airlock Cycle Controllers

* Changes the override time back to 15 seconds

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

* Automatic changelog compile [ci skip]

* Datum-based poll creation and vote handling (#1958)

* Attack_verb grammar (#1988)

* Fixes a bunch of attack_verb lists, turns torn into tore

* This grammar is torn me apart

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

* Automatic changelog compile [ci skip]

* initial (#1991)

* Automatic changelog compile [ci skip]

* Ports VV stuff from TG (#1930)

* Fixes list vv with numeric values (#47120)

* Port "VV refactors 2 - Actually not indefinitely WIP" from TG

tgstation/tgstation#45217

* Port "Fixes orbit offsets and adds matrix vv preview." from TG

tgstation/tgstation#51198

Co-authored-by: AnturK <[email protected]>

* [READ THIS PR]RNG removal PART 2: SIMPLEMOBS (#1808)

* simplemob damage rework, etc

* fixes travis

* misc

* beepsky baton, more rng removal

* up to date, removes controversial slime buff and carp nerf

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

* Automatic changelog compile [ci skip]

* Changes for latest stable (#2000)

* Updates to latest stable

* Fixes the station_names glob for 1526

* Automatic changelog compile [ci skip]

* New/Updated Safety Moth(TM) Posters! (#1982)

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

* Automatic changelog compile [ci skip]

* BUffs stimulum (#1954)

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

* Automatic changelog compile [ci skip]

* Replaces a view check with a can_see check (#1996)

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

* initial (#1953)

* Automatic changelog compile [ci skip]

* Fixes a toe stubbing oversight (#1998)

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

* Fix slot machines (#1950)

* Automatic changelog compile [ci skip]

* laser pointer (#1990)

* laser pointer

can't blind through walls

* laser pointer 2

combine the  if check

* Revert "laser pointer 2"

This reverts commit dd9f61b5bf9a99096a94179875ad13dd9b487aeb.

* laser 3

using can_see now

* changing values

changing from 7 to 6  as can_see 7 increase the range by 1

* Skeleton spawner fix (#1970)

you now no longer spawn as a human

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

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

* Automatic changelog compile [ci skip]

* The return of flypeople (#1967)

* The return of flypeople

This just makes flypeople available at roundstart again.

* Update game_options.txt

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

* Automatic changelog compile [ci skip]

* Foo!

* Oops

* Parallax fix (#49850) (#2012)

Co-authored-by: Dennok <[email protected]>

* Edited sprite for the stacking machine. (#2003)

* funny

ahaha

* Add files via upload

* Add files via upload

* Delete mining_machines.dmi

* Delete STFUHAYDEN.ogg

* Delete mining_machines.dmi

* Add files via upload

* changed sprotes

changed so the bs miner uses its own sprite

* Delete machine_bluespaceminer.dm

* Delete mining_machines.dmi

* Add files via upload

* sprotes

* Delete machine_bluespaceminer.dm

* coode

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

* Fix lighting on CameraConsole and Spy Bug (#50669) (#1975)

* Automatic changelog compile [ci skip]

* random maint: delta station (#1956)

* adds random maint to delta

* e

* adds randommaint psychiatrist

* adds psychiatrist to the pool

* mapmerge

* e

* space under doors fix

* fixes 3 rooms

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

* Reveal ghosts when the round ends (#51572) (#1969)

* Reveal ghosts when the round ends

* Add feedback

Co-authored-by: MrDoomBringer <[email protected]>

* Alive players can now hear dead players when the round is over

Co-authored-by: MrDoomBringer <[email protected]>

Co-authored-by: MrDoomBringer <[email protected]>

* Admin verb reorganization + extra (#1856)

* missed one

* feedback from the bees

* since I'm here, why not

* admin verb reorganization + 1 fix

* get rid of those new era comments, we in the big bee now

* ACTUALLY feedback from the bees (git derp)

* edit objective from team panel

* check teams is now an admin verb

* bye bye leftover comment

* Revert gold necklace name in beecoin shop (#1924)

* Revert gold necklace beecoing shop name

* fix

beecoin shop now has two names for gold necklace: 'dope necklace' and 'necklace, gold'

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

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

* stasisoverlay (#1926)

* silly me (#1927)

* Automatic changelog compile [ci skip]

* TGUI Orbit Menu (#1968)

* New tgui based orbit menu (#51585)

* New tgui based orbit menu

* Update tgui.bundle.js

* Safely check len if orbiters is null

* Add a search bar

* Rename Antagonists to Ghost-Visible Antagonists

Co-authored-by: Emmanuel S. <[email protected]>

* Move ghosts below alive

* Rebuild tgui.bundle

* Update as per stylemistake's feedback

* Cosmetic stuff

* Rebuild tgui

* Replace localeString with faster alternative

* Update tgui.bundle.js to latest upstream

* Hitting enter in the search bar will now snap you to orbit the most relevant result

Co-authored-by: Emmanuel S. <[email protected]>
Co-authored-by: Aleksej Komarov <[email protected]>

* rebuilt

* dme

* Adds scroll bar to ghost Orbit menu (#51681)

* Add scroll bar to ghost orbit menu

* Rebuild TGUI

* rebuild

Co-authored-by: Emmanuel S. <[email protected]>
Co-authored-by: Aleksej Komarov <[email protected]>

* Automatic changelog compile [ci skip]

* fixes Cyborg and Integrated Circuit cameras (#2014)

* add a get_turf(C)

* remove the var

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

* e (#2018)

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

* Automatic changelog compile [ci skip]

* Removes support for versions below 513.1526. (#2007)

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

* Automatic changelog compile [ci skip]

* Optimizes lighting (#1943)

* VROOOOM (#51546)

* nevermind

Co-authored-by: Bobbahbrown <[email protected]>

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

* Automatic changelog compile [ci skip]

* I missed a couple VV fix PRs (#2023)

* Fixes VV editing name and ckey in header (TG/#45742)

* fix

* Fixes unnecessary whitespace changes/line ending changes.

* Fixes VV renaming (TG/#46410)

* vv fix

* forgot the define

* Adds specified give control option to mob VV (TG/#48290)

* Adds specified give control option to VV

* click ckey to run

* Safer, less nullspacey.

* logging fixed

* review

Co-authored-by: kevinz000 <[email protected]>
Co-authored-by: skoglol <[email protected]>

* small fixes (#2020)

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

* Automatic changelog compile [ci skip]

* changes to lexorin and sulfonal recipes (#2022)

* Update toxins.dm

* Update toxins.dm

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Removes Exploitable World/Topic Command server_hop (#51793) (#2034)

Co-authored-by: Bobbahbrown <[email protected]>

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

* Automatic changelog compile [ci skip]

* Fixes some DoS vectors (#1957)

Co-authored-by: deathride58 <[email protected]>

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

* Automatic changelog compile [ci skip]

* Corrects the schema version (#2039)

* Why didn't I think of this sooner? (#2040)

Co-authored-by: Crossedfall <[email protected]>

* [Port] BSQL Replacement (#2038)

* Pass 1

* Reverts poll changes and removes sanitize calls

* Removes duplicate definition from IsBanned

* Pass 2

* Thiccens rust-g with all the additional features.

* Re-adds extools to Travis

* Remove BSQL_DEBUG config option (#51508)

Leftover code does nothing now.

(cherry picked from commit 5a319257fd8e04539846d794538077bacb0fb037)

* first round of rbsql/brsql fixes (#51517)

(cherry picked from commit 0bc58c667d0854c17ea8be00b4a3c60bc8e68ec3)

* Resets poll.dm and new_player.dm to master

* Correctly updates poll and new_player

* Pass 3

* mentor qdel additions

* Fixes my sloppy copy paste job

* Fixes the death insertion query

Co-authored-by: Tad Hardesty <[email protected]>
Co-authored-by: Jordie <[email protected]>
Co-authored-by: Kyle Spier-Swenson <[email protected]>

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

* Automatic changelog compile [ci skip]

* Adds hydraulic blade implant (#1948)

* Adds hydraulic blade implant ot the game

* flavour text update

* price adjusted

* fix

* fix

* fix

* fix

* fix

* replaced emagged toolset arm cyborg knife with hydraulic blade

* fix

* changed flavour text

* fix

* fix?

* hmmm

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

* Automatic changelog compile [ci skip]

* Fixes ban check queries (#2041)

* Add dermal button icons (#2037)

* Update all_nodes.dm

* Delete actions_items.dmi

* Add files via upload

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

* Fix Malformed SQL Queries When Editing Admin Permissions (#51625) (#2044)

(cherry picked from commit 9b6457f770fb5c7440c5c7bf8ae9bc0f88c6d21b)

Co-authored-by: Bobbahbrown <[email protected]>

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Adds the dice cup, and dice show which side is face up on examine (#2051)

* Yachts!

* Making it obtainable

Co-authored-by: u6104537 <[email protected]>

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

* Automatic changelog compile [ci skip]

* Updated Pumps in MetaStation (#2002)

* Updated Pumps in MetaStation

* Add MapMerge

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

* Fixes broken botany iconstates (#2050)

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

* Automatic changelog compile [ci skip]

* I lashed bug (#2052)

Co-authored-by: u6104537 <[email protected]>

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

* Automatic changelog compile [ci skip]

* Metastation SM used Neutrogena and has volume now (#2054)

* Fixes Decal, turns most Volume pumps off, replaces two final gas pumps with Volume pumps

* Fixes airlock controllers

* Cargo shuttle and Labor camp airlock controllers

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

* Automatic changelog compile [ci skip]

* bang protect = 0 (#2055)

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

* Automatic changelog compile [ci skip]

* Log arguments on query leak and Slow Query (#2049)

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Fixes push brooms breaking things (#2061)

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

* Automatic changelog compile [ci skip]

* Removes bad squidnames (#2063)

* Update squid_male.txt

* Update squid_female.txt

* Update squid_male.txt

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

* Automatic changelog compile [ci skip]

* Fixes bad client runtime (#2064)

* Fixes the skin (#2065)

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

* Fixes addiction runtime (#2066)

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Rust-g SQL Fixes Round 2 (#2071)

* Fixes edit notes error

* Fixes editing bans

* SQL_roles fix for single roles (Lavaland)

* qdel admin warning removal

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

* Automatic changelog compile [ci skip]

* Removes BSQL and updates rust-g (#2072)

* AI good now!

* Automatic changelog compile [ci skip]

* Makes the status panel less laggy by removing multi-column stats() (#2070)

* pain

* help2

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

* Automatic changelog compile [ci skip]

* Fixes Metastation patrol route (#2075)

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

* Automatic changelog compile [ci skip]

* Adds the Virus Extrapolator, removes Viral Base bottle (#2013)

* begin extrapolating

* extrapolator completion

* adds uses to extrapolator

* mapping changes

* medical lathe can print scanning modules

* adds vector to box and pubby, belt inclusion

* makes maint bloodier

* framework for blob spores, bacon shit

* dinky formatting

* Update scanners.dm

* Update scanners.dm

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

* Automatic changelog compile [ci skip]

* weekly cat surgeon buff [hopefully the last one] (#2042)

* i fixed it

* yes

* Update cat_butcher.dm

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

* Automatic changelog compile [ci skip]

* Fleets! Movement and more. TODO: Starmap pathfinding

* Automatic changelog compile [ci skip]

* summary (#2074)

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

* Automatic changelog compile [ci skip]

* nerfs macrophage (#2016)

* nerfs macrophage a bit

* phages more aggressive

* adds death timer

* nerfs damage more

* ups

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

* Automatic changelog compile [ci skip]

* fixes to disease channels (#2082)

* fixes to disease channels

* Update advance.dm

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* UI fixes, fleets now move randomly, bug fixes, and more!

* fixes

* Start of a new map, Honkferatu bananium buff

Honkferatu ruin now has a closet with 30 bananium ores. (More in line with other )

* Map merged gondolas

* typo moment!

* meth brain damage is not broken anymore (#2001)

* meth brain damage is not broken anymore

reverts the 10x damage spite PR from tg that makes meth unusable

* Update drug_reagents.dm

* New ctf map (#2076)

* cool

* glass

* Replaces railings with glass you can shoot through

* nothing

Nothing

* ts7

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

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

* Automatic changelog compile [ci skip]

* Ports hat throwing from TG (#1952)

* Adds SNUG_FIT & EFFECT__HAT bitfields and object flags. Adds target_zone var to thrownthing

* Refactors obj_flags.dm, lines have consistent tabbing for readability

* hat knocking code, including SNUG_FIT and EFFECT_HAT obj flag checks. All thanks to MMMiracles and tgstation

* Adds SNUG_FIT and EFFECT_HAT clothing flags to all appropriate headgear

* Adds SNUG_FIT to hardsuit helmets, whoops

* Don't need all these extra SNUG_FIT flags, they're already there from _spacesuits.dm

* adds SNUG_FIT to hoods, cloaks, and wizard hats. note: This means all real and fake wizard hats can't be knocked

* Final batch, doing one last /obj/item/clothing/head sweep

* Final scouring for required SNUG_FIT and EFFECT_HAT instances

* Drone hats get SNUG_FIT, peaceflower gets EFFECT_HAT

* adds SNUG_FIT to tinfoil hats, tinfoil envirohelmets, and peace flowers. they shouldn't be easy to remove

* Adds a few missing span ends

* Prevents all wearable non-clothing objects from being knocked off by other hats

* Don't do this to me Travis

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

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* MiningMonstermosCompliance FOB and Roci

* Deleting APC

* A change to stand's healing ability (#1965)

It seems the intention was to have healing while not deployed to be a third of healing while deployed but no less than two. But because heals variable is negative, max(heals * 0.5, 2) always returns a value of 2 and so healing while not deployed deals 2 damage across the board.

The change will bring this to what I assume was the intention. That is, 1/3 heal from the inside but no less than 2.

I will also make another PR in case stand is only supposed to heal while deployed. Because damaging the stand user in healing mode should not be a thing.

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

* Automatic changelog compile [ci skip]

* virus food progresses diseases (#1961)

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

* Automatic changelog compile [ci skip]

* Fixes a null.species runtime (#2092)

* Modify Canister Gas verb (#2094)

* Modify Canister Gas verb

* Move it to VV dropdown

* unnecessary

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

* [BOUNTY] Log item cremation and deep frying (#1981)

* Log item cremation

* Log it on the mob too

* Log deep frying

* wrong letter you fool

* E

* user log

* Automatic changelog compile [ci skip]

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

* New Bluespace Productions Products! (#1873)

* Adds lore papers

* Adds capsule items

* Adds capsule code

* Lets cargo purchase 3/4 capsules

* Adds the new shuttle code

* Adds map files for the capsules

* Adds shuttle map file

* Adds capsule files correctly?

* Updating mining p1

* Updating mining p2

* Adds the camp capsule

* adds mining food vendor

* space shelter has a unique sprite now

* Updating mining P3

* Updating mining P4

* Made a mistake in the shuttle

* fixed a thing with the shuttle

* Didn't mean to put this here

* Didn't mean to put this here

* Didn't mean to put this here

* Didn't mean to put this here

* Trying to restart Travis

* Map Merging P1

Shoutout to ike for informing me about this mystical program

* Map Merging P2

* Map Merging P3

* Map Merging P4

* Map Merging P5 (Attempting to replace)

* I think this is why the error exists

* Fixing 1/2 of the last bug

* Im a fucking spaz

forgot to change one of the uniforms and instead changed the mining boots instead

* I am a fucking spaz Part 2

I forgot to #include the vending machine file

* Windows didn't have plating under them

* Added a first aid kit to the space shelter

* Medical tent didn't have a fan

* Moving the fans P1

Bacon said their main purpose was to block atmos flow and putting them in the middle of rooms wouldn't do that

* Moving the fans P2

* Forgot that the old map had the shitty filepath

* 7500 bro really das too much

Dropped the price of  the camp capsule from 7500 to 5000

* Added a sign for the medical tent

* Adds sign code

* Medical and Engineering get signs

* Party 1

* Party 2

* Sprite change + Party 3

* Party 3 + Sprites

* Party 4

* Medical Capsule isn't as neon now

* Fixing some text that looked bad

* Little text update to restart the build checker

* Updating the sign text

* Forgot a few fans

* Forgot a few fans 2

* Changing reinforced windows to normal windows

By request of Zesko

* Little sprite update

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

* Automatic changelog compile [ci skip]

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

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

* linters

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

* Whisp FOB

* fixing a big oopsie

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

* Compile error fixes

* Boy aren't map-level edits fun!

This is the only way we'd be able to do secrets in practice
Shit like this is why I'd rather rebase to goon and lose every last drop of
progress before I support broad use of that strategy.

* thanks tgui

* Fix a nullable query argument

* reconnects engine to SMES at roundstart

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

* are ya winnin son?

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

* Update comp_changelog.yml

* Update make_changelogs.yml

* Update comp_changelog.yml

* Automatic changelog compile [ci skip]

Co-authored-by: ss13-beebot <[email protected]>
Co-authored-by: zeskorion <[email protected]>
Co-authored-by: Mick1299 <[email protected]>
Co-authored-by: Cenrus <[email protected]>
Co-authored-by: Flakkyboo <[email protected]>
Co-authored-by: St0rmC4st3r <[email protected]>
Co-authored-by: PowerfulBacon <[email protected]>
Co-authored-by: Vasily2013 <[email protected]>
Co-authored-by: ike709 <[email protected]>
Co-authored-by: Trigg <[email protected]>
Co-authored-by: AnturK <[email protected]>
Co-authored-by: Crossedfall <[email protected]>
Co-authored-by: Ayy-Robotics <[email protected]>
Co-authored-by: WirelessWarlock <[email protected]>
Co-authored-by: Jesusaholy1 <[email protected]>
Co-authored-by: Kmc2000 <[email protected]>
Co-authored-by: Dennok <[email protected]>
Co-authored-by: BettonnCZ <[email protected]>
Co-authored-by: MrDoomBringer <[email protected]>
Co-authored-by: Sinmero <[email protected]>
Co-authored-by: Aleksej Komarov <[email protected]>
Co-authored-by: Bobbahbrown <[email protected]>
Co-authored-by: kevinz000 <[email protected]>
Co-authored-by: skoglol <[email protected]>
Co-authored-by: That0nePerson <[email protected]>
Co-authored-by: deathride58 <[email protected]>
Co-authored-by: Tad Hardesty <[email protected]>
Co-authored-by: Jordie <[email protected]>
Co-authored-by: Kyle Spier-Swenson <[email protected]>
Co-authored-by: Matthew Longman <[email protected]>
Co-authored-by: Dingo-Dongler <[email protected]>
Co-authored-by: u6104537 <[email protected]>
Co-authored-by: xboxnoob <[email protected]>
Co-authored-by: yorii <[email protected]>
Co-authored-by: Gallyus <[email protected]>
Co-authored-by: Archanial <[email protected]>
Co-authored-by: Goat Monarch <[email protected]>
Co-authored-by: GoatMonarch <[email protected]>
Co-authored-by: Sergei <[email protected]>
Co-authored-by: Ravellon <[email protected]>
@Freudeheit
Copy link
Author

repo owner remove pls github very confusing ui

@Kmc2000
Copy link
Contributor

Kmc2000 commented Jul 16, 2020

Uhh...what

@Freudeheit
Copy link
Author

I wanted to merge all the changes from the main repo into my fork which I did before but github suddenly decided to do it the other way around

@Bobbanz1
Copy link
Contributor

Bobbanz1 commented Dec 1, 2022

The hell is this and why was one of my PRs mentioned here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants