Changed Heads of Staff meeting room and high-powered air scrubbers. #3
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
…ner. Changed the name of the mass air scrubbers to "Stationary Air Scrubber" since they can't be moved.
Petethegoat
added a commit
that referenced
this pull request
Jan 21, 2012
Changed Heads of Staff meeting room and high-powered air scrubbers.
This was referenced Mar 26, 2013
This was referenced Apr 5, 2013
Closed
Closed
Cheridan
added a commit
that referenced
this pull request
Sep 5, 2013
Terbs weekly fun #3 detective can reskin his gun
KazeEspada
added a commit
to KazeEspada/-tg-station
that referenced
this pull request
Sep 9, 2013
Fixes HONKs having a unique equipment selection menu that caused bugs. Replaced by the one that all mechs use. Fixes bug tgstation#103. Makes a var on supply packs that determines whether they get deleted or garbage collected. If the supply pack contains an object that references others it must be deleted. Mulebot tgstation#3 can finally rest in peace. Fixes bug tgstation#137
Merged
KazeEspada
added a commit
to KazeEspada/-tg-station
that referenced
this pull request
Sep 10, 2013
…m making artifacts like mulebot tgstation#3. Fixes issue tgstation#137. Moves the supply shuttle controller to the controller folder and adds its creation to the new proc of the master controller. Also, makes the supply shuttle make supply packs on new instead process.
Merged
caelaislinn
pushed a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
/tg/ updates
caelaislinn
pushed a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
Update master
caelaislinn
added a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
More merges
caelaislinn
pushed a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
Bleeding edge freeze
caelaislinn
pushed a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
Bleeding edge freeze
caelaislinn
pushed a commit
to caelaislinn/-tg-station
that referenced
this pull request
Sep 19, 2013
Bleeding edge freeze
EOBGames
pushed a commit
that referenced
this pull request
Mar 11, 2021
* cool map bro! * security * perma * secfull * secman * medstart * engine2 * atmos start * barrrr * bar2 * bar3 * civil * lower * barrrr * barrrrrr * start * cargo * sci * j * servicedecal * civildecal2 * service decal2 * service decal 3 * service decal 4 * pip * decal4 * decal8 * arse! * arrivals * arrivals 2 * ai * aifix * vault+techstorage * medbay * bridge 1 * sec 3 * sectest * squish squish * securitywork * secmore * config setup * tram * cargo work * escape * disposalfuck * i hate pipes * disposalsfull * SEC * grav * bads * researchwip * caw * hguhwhuh?? * apc+air_alarm * engie * sm * stttt * aisat * areas * camera wip * camera 2 * secam * shuttle shit or something idk * aaaa * path nodes + waypoint navs * almost there * pull * unnecessary file * standardize * tram choo choo!!! * tgm * testmerge feedback fixes * map work * test * test2 * i hate * THERE * trams without pulling upstream like an idiot (#3) TRAM * fast tram fast TRAM * fuck turfs * tram collisions, tram cooldowns (#4) lol * ass * tram but real * forgot the , * code improvements, fixes, and tram call buttons (#5) * unnecessary check gone, nulls now scrubbed (#6) * fancy tram * feedback changes * AT fix * feedback changes * incin+engine atmos wooo! * missing grav gen cable * more feedback changes + diagonal shuttle wall * bottom floor explodes into airless asteroid instead of space now * even more feedback changes * area change * update to iron sheets * ore smelter wrong dirs * path changes agagagagaga * no more fabs * atmos fixes + more general fixes * Creates SStramprocess and Makes Movement Use That Instead of Timers (#7) * makes SStramprocess a child of SSprocess and makes tram obj use it * gets rid of continue_movement() in favor of SStramprocess * remove fake tram * tgm baby * maintenance update + chode tram * hopefully makes the tram choke the server out less (#9) tries to put brakes on the tram * bad id console * more maint stuff * Big bundle of fixes and additions for trams (#10) * BANG TING OW * fixes docs, makes everyone always take damage, fixes bump text and span * control prevention... maybe? * combat mode no longer triggers trams * tram conflicts + tram console * medical changes + tram lift console * bot pathing in tunnels * tram whiteship + bad area string fix * -station fixes -tram monorail -tram monorail grinding + achievement * trail these noots * rail * yee * diner bots + xeno changes * Tram TGUI FINALLY (#11) * bflehgfwblilbrga * Update TramControl.js * --fix, --lint * more ui * brokendimmer now doesn't try to load content, static data updates, MORE sanity. * finishing off tram sprites * cleaning up dmis * Portal Improv * re-removes icons * relay moved, map fix * fixed? (#12) * rd machines * relay moved, upload moved to sci, service lathe access, typo * maint stuff * tgm * medical overhaul, more maint junk * comments out achievements for testing * space hole + spare * actual tram blender fix according to known blender method * tgm * trail these * removes depreciated tram content + accidental changes during pulling Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com> Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
ghost
mentioned this pull request
Djiq
pushed a commit
to Djiq/tgstation
that referenced
this pull request
May 31, 2021
Make wallets use the ID thats physically in the first slot in the wallet
Djiq
pushed a commit
to Djiq/tgstation
that referenced
this pull request
Jul 20, 2021
* null crate problemo thanks TCEO * Softsuit Resprite DNM * Update packs.dm * Update uplink_items.dm * Update uplink_items.dm * Update uplink_items.dm * Adds Bricks and Rubble Adds bricks and rubble northeast of atmos... * Fixes an /area having a desc somehow... dun goof'd * even more SDMM fixing removed the area entirely and replaced it. * Adds auxiliary engine to MetaStation - Adds maintenance control room - Adds secondary engine next to control room - adds the secondary engine /area * WIP Adds Engines DNM, adds tesla, singulo and mrspacman * Final Touches Makes the PA's range longer and finalizes the setup. * Revert "null crate problemo" This reverts commit fde6a69. * Run linter fix #1 * Run linter fix tgstation#2 * Run linter fix tgstation#3 * Another fix... * Fix tgstation#5 * Fix tgstation#6 * Fix tgstation#7 LUCKY NUMBER, LETS HOPE IT SPLATS 2 ERRORS! * Fix tgstation#8 FIX tgstation#7 NAILED 2, SWEET! * Fix tgstation#9 * Fix tgstation#10 * Fix tgstation#11 GIVE IT UP FOR FIX NUMBER ELEVEN... * Fix tgstation#12
Imaginos16
pushed a commit
to Imaginos16/tgstation
that referenced
this pull request
Feb 4, 2022
Revert "Guh"
GeneriedJenelle
added a commit
to GeneriedJenelle/tgstation
that referenced
this pull request
Feb 28, 2022
Fix modular lights
MassacreDemigirl
pushed a commit
to MassacreDemigirl/tgstation
that referenced
this pull request
May 9, 2022
Clowning i clowna entegre
FernandoJ8
pushed a commit
to FernandoJ8/tgstation
that referenced
this pull request
Aug 20, 2022
Mothblocks
added a commit
that referenced
this pull request
Nov 19, 2022
…ed volume (#71327) ## About The Pull Request Simple Unit Test that seeks to ensure that we don't put too much of a reagent in a container when the container doesn't have enough volume to accept all of it. Nothing bad would happen, but it's just silly really. I also fixed all of the instances that this was broken in. ## Why It's Good For The Game Prevents buggy regressions, such as those found in #71206. ```txt [2022-11-18 03:32:30.736] FAILURE #1: Canned Laughter (/obj/item/reagent_containers/cup/soda_cans/canned_laughter) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 - FAILURE #2: T-Borg's tonic water (/obj/item/reagent_containers/cup/soda_cans/tonic) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 - FAILURE #3: The soda water (/obj/item/reagent_containers/cup/soda_cans/sodawater) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 ``` ## Changelog :cl: fix: Canned Laughter, T-Borg's Tonic Water, and Soda Water cans should all come with the expected marketed 50 units of goodness, rather than cheaping out on materials for only 30 units of can volume. /:cl: Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
SeigaSeiga
pushed a commit
to SeigaSeiga/tgstation-local
that referenced
this pull request
Dec 15, 2022
robotduinom
referenced
this pull request
in psychonaut-station/PsychonautStation
Jan 4, 2023
yeni spritelar fixed
RuByxarik
pushed a commit
to RuByxarik/tgstation
that referenced
this pull request
Mar 18, 2023
3 tasks
ChungusGamer666
added a commit
to ChungusGamer666/tgstation
that referenced
this pull request
May 15, 2023
ANOMALIES AND ARTIFACTS - part 1
Zonespace27
pushed a commit
to Zonespace27/tgstation
that referenced
this pull request
Jul 23, 2023
Monke rebase
Jacquerel
pushed a commit
that referenced
this pull request
Aug 12, 2023
…nent (#77539) ## About The Pull Request Hey there, I've personally fallen for this stupid thing twice (in #77503 and #75627 (d357516)), so I decided to spend a few hours to crack out a unit test to ensure that I (and no one else) falls for this stupid thing again. Let me know if there's a smarter way to code something like this, but I couldn't figure out a better way to accomodate the current framework and be as agnostic to certain oddities as possible. ## Why It's Good For The Game Catches stuff like this: ```txt [2023-08-11 21:10:04.019] FAILURE #1: The mob Garden Gnome does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #2: The mob the morph does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #3: The mob the guard spiderling (946) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #4: The mob the ambush spiderling (255) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #5: The mob the scout spiderling (375) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #6: The mob the flesh spiderling (337) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #7: The mob the hunter spiderling (869) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #8: The mob the nurse spiderling (629) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #9: The mob the tangle spiderling (19) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #10: The mob the broodmother spiderling (855) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #11: The mob the viper spiderling (519) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #12: The mob the tarantula spiderling (963) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #13: The mob the spiderling (100) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 ``` (ignore the part about gnomes and morphs, this was an earlier version of the unit test. everything else was relevant and is fixed) ## Changelog :cl: fix: Growing spiders will now retaliate against you like they were always meant to. /:cl:
MarkSuckerberg
pushed a commit
to MarkSuckerberg/tgstation
that referenced
this pull request
Aug 27, 2023
adds deployment capabilities and switches to unobstructed sprites
Zonespace27
pushed a commit
to Zonespace27/tgstation
that referenced
this pull request
Aug 30, 2023
…nent (tgstation#77539) Hey there, I've personally fallen for this stupid thing twice (in tgstation#77503 and tgstation#75627 (d357516)), so I decided to spend a few hours to crack out a unit test to ensure that I (and no one else) falls for this stupid thing again. Let me know if there's a smarter way to code something like this, but I couldn't figure out a better way to accomodate the current framework and be as agnostic to certain oddities as possible. Catches stuff like this: ```txt [2023-08-11 21:10:04.019] FAILURE #1: The mob Garden Gnome does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #2: The mob the morph does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#3: The mob the guard spiderling (946) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#4: The mob the ambush spiderling (255) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#5: The mob the scout spiderling (375) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#6: The mob the flesh spiderling (337) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#7: The mob the hunter spiderling (869) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#8: The mob the nurse spiderling (629) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#9: The mob the tangle spiderling (19) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#10: The mob the broodmother spiderling (855) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#11: The mob the viper spiderling (519) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#12: The mob the tarantula spiderling (963) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE tgstation#13: The mob the spiderling (100) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 ``` (ignore the part about gnomes and morphs, this was an earlier version of the unit test. everything else was relevant and is fixed) :cl: fix: Growing spiders will now retaliate against you like they were always meant to. /:cl:
Ical92
added a commit
to Ical92/tgstation
that referenced
this pull request
Sep 6, 2023
Works on cargo, maybe finished enough? Also other stuff
Striders13
pushed a commit
to Striders13/tgstation
that referenced
this pull request
Nov 24, 2023
Фикс анлоков экспериская
NamelessFairy
pushed a commit
to NamelessFairy/tgstation
that referenced
this pull request
Dec 15, 2023
Tb 23 arena tiki
Paxilmaniac
added a commit
to Paxilmaniac/tgstation
that referenced
this pull request
Jun 25, 2024
fixes smoothing group order on a lot of stuff
Paxilmaniac
added a commit
to Paxilmaniac/tgstation
that referenced
this pull request
Jul 26, 2024
…mode Adds a preference for facing your mouse while in combat mode
Paxilmaniac
pushed a commit
to Paxilmaniac/tgstation
that referenced
this pull request
Jul 26, 2024
Lauwma
pushed a commit
to Lauwma/Harvest_Station
that referenced
this pull request
Nov 3, 2024
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.
Moved the photocopier slightly to the south and renamed the high-powered air scrubbers.