[pull] master from ParadiseSS13:master #15
+1,511,603
−1,245,825
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* erguertbngio3eunf3o2we4if * woop de doo
* refactor: Elementize decals. * fix for cases of managed_overlay being a single item * Update code/datums/elements/decal_element.dm Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * review comments --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]>
* added Russian Nians * adds a new space ruin Voidhopper of Nexus aka freighter * forgot a quotation mark * Convert maps to TGM new : _maps/map_files/RandomRuins/SpaceRuins/freighter.dmm new : code/modules/unit_tests/atmos/test_ventcrawl.dmm Automatically commited by: tools\mapmerge2\fixup.py * fixed file format of the ruin * renamed Russian Nians to Soviet Nians * see above * down with russian nians, long live soviet nians * added a ruin paper per Warriorstar's request * the name russiannian just will not be fully replaced * forgetting commas and adding a new subtype of paper for the shipping manifest * I think using quotation marks is causing me issues * further removal of the term "russian" in preperation of a PR removing lots of referrals to russia * added some new Poly voice lines * accidentally commited the wrong PR... Signed-off-by: Hayden Redacted <[email protected]> * made the shipping manifest ticked * worked on the perspective of some stairs * made changes requested by warriorstar * changed formatting of the sovietnian's loot Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * forgot to add a new line * i think this is causing the tests to fail perchance * purging the term russian to be in line with a recent PR doing the same Signed-off-by: Hayden Redacted <[email protected]> * fixed sovietnian to snake_case Signed-off-by: Hayden Redacted <[email protected]> * i may forget snake case exists * second time's the charm like a snake's two fangs * added warriorstar's suggestions * reverted a file that was accidentally converted * fixed merge issues * added an extra line Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> --------- Signed-off-by: Hayden Redacted <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Burzah <[email protected]>
* minesweeper with no style * less string operations * review and aylongo tgui changes * bundle * minesweeper with no style * less string operations * review and aylongo tgui changes * bundle * bundle * bundle * silent. pda is booming * codestyle * review * revert * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Signed-off-by: Burzah <[email protected]> * adjusts the name of a proc --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Henri215 <[email protected]>
…ute_abductee runtime (#27289)
… change (#26897) * Fixes #26844 * removed some extra whitespace * camel case'd everything that wasn't inherited and also switched seed lavelling to use the new update_name() * ...and a little to the left... * Alright, that's all set, hopefully! * Update code/datums/components/label.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Pidgey <[email protected]> * Picky, picky. * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * Update code/datums/components/label.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Pidgey <[email protected]> * One more tweak, hopefully. --------- Signed-off-by: Pidgey <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
Co-authored-by: Adrer <[email protected]>
* Update stunbaton.dm * Update code/game/objects/items/weapons/stunbaton.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: CRUNCH <[email protected]> --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Contrabang <[email protected]>
…d only does so once (#27415)
* Added envirosuits to departmental vendors * added envirosuits to garment bags * added mining envirosuit to mining wardrobe locker * fixed genedrobe organization
* api: Spawn pools, a distributed loot manager. * meh * documentation and cleanups * how do numbers work * word wrapping * fixes found from prototyping
Co-authored-by: Bmon <[email protected]>
…kdown back. (#27314) * cutting edge * remove the message admins lmao * eh name should just be temporal * undef * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * updates description, removes shock change as it happens on live now I guess --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Burzah <[email protected]>
…27393) * Recounts cultists every once in a while * Update code/modules/antagonists/cult/team_cult.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> * Remove old check --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Adds a new candy , chocolate bar, to the vending machine. * Update candy.dm Signed-off-by: Kaelthorian <[email protected]> * Update candy.dm No more Omniforge corp , better for lore this way. Signed-off-by: Kaelthorian <[email protected]> * Update candy.dm Signed-off-by: Kaelthorian <[email protected]> * Fixing the choco icon name. * Renamed the chocolate bar to Delux Chocolate-bar and changed the icon to something more chocolate like. (CO) * Name Change * Update candy.dm Signed-off-by: Kaelthorian <[email protected]> * Moved the obj from candy to junkfood. * Change fix * Update code/modules/food_and_drinks/food/foods/candy.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Kaelthorian <[email protected]> * Update code/modules/food_and_drinks/food/foods/junkfood.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Kaelthorian <[email protected]> * Fixing names and icons. * Update generic_vendors.dm Signed-off-by: Kaelthorian <[email protected]> * icon update --------- Signed-off-by: Kaelthorian <[email protected]> Co-authored-by: RTProductions <[email protected]> Co-authored-by: Henri215 <[email protected]>
… helpers. (#27017) * refactor: Migrate more random_spawners to random/spawners and mapping helpers. * set script PR number * maybe using a reserved keyword isn't a great idea * oh i guess we're done * whoops * make code actually work * gnarg * rerun updatepaths for recent changes * rerun updatepaths for recent changes * fix build
* refactor: move damaged ruin ripley to subtype * set script PR number * derp * fix typepath
* Fixes surgery delays * easy fix
* Moves pulse from moderate to major * Removes the Pulse from Moderate
* Initial commit * Adjusts remaining inputs * Call fix
* Here goes nothing... * Forgot we have organizations now * Changes average probability to 65
…ssages (#27578) * Initial Commit * message adjustment
* Why is this not working * Oh that's why * Komrad request
* sprites * side sprites removed a pixel (arm)
* Re enables beta CI * aaaaaaaaaaaaaa
* Add ruin spacer. * strip padding for lava ruin placer as it's already constrained by available surface area
* refactor: /New -> /Initialize §2: stacks * remove named arg from phazon BS crystal removal * whoops
* tgui debug spawn * Small nit
* Added a few new posters. Adds 9 new posters to the standard poster pool. * Add band poster descriptions Adds more detail to the band poster descriptions * Spot edit * Two more posters Adds vox and skulk themed posters. * Typo fix Fixed a typo and reworded a part
* Remove ancient random spawners. * set script PR number * rest of updatepaths * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: DGamerL <[email protected]>
…7736) * fix magic touch spells false deleting, fix spelling, allow escape * leaps out of
…ing it. (#27728) * Create a dedicated area on Z-1 for tests. * Place landmarks in testing area, with a 1-tile margin against walls. * Consolidate map testing behavior and use a clean z-level. * lint map * undo SDMM var sanitization on centcomm
* Nct ID * Preferences, job creation, access and other stuff * Sprites, defines, hidden job pref and other stuff! * Missed a comma * Sprites updated, clothing code, outfit and id * Fix a small oops * Data chip + Sechud icon * Offstation, access, datachip code, ticket autoresponse and a lot of other stuff. * Typo, spritesheet fixingg and icon color * Telebaton removed, not allowed to scan ERT IDs, blacklisted some access * Applies suggestion Co-authored-by: Aylong <[email protected]> Signed-off-by: Pedro <[email protected]> * Applying Suggestions! * Forgot to increase the number of slots, oops * Added a few items that I forgot, applying suggestions. * Fix check fail? * Mapping Tools/Icons. * Office added to all maps, a few modifications to fit. * Adds ACCESS_TRAINER to who needs it. * Fixing check fails. * NCT Beret obj are now where they're supposed to be * Suggestion Co-authored-by: Burzah <[email protected]> Signed-off-by: Pedro <[email protected]> * Sprites fix + NCT flag * Code Suggestion * Sprite update * Suggestions * Diagoras Office, conflict fix. * Day 1 fixes, suggestions. * bundle rebuild * Fixing a few issues. * Mapping review + Suggestions * Fixed check fail. * Conflict fix + You shouldn't be able to insert the NCT chip into an id console * Fix map conflicts * Plasmaman icons and Kidan icon fix * Conflict fix? * A few changes following feedback. * Small description changed, as per requested feedback. * Suggestions/Fix * Forgot some mapping issues * Suggestions * Fixed? * Fix linters * More fixes * aaaaaaaaaaa * Christa's reviews * Naming stuff --------- Signed-off-by: Pedro <[email protected]> Co-authored-by: Aylong <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* Fixes camera names in the PTL rooms * Fixes naming on delta station * Corrects the camera networks as well
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )