Merge Upstream 14.09.2024 #1508
Merged
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
…S13#26722) * Adds some missing boards * I didnt forget cere
* Move global access procs to the mapping subsystem * Apply requested changes
…made of (ParadiseSS13#26730) * Floorbots now actually use the colour of the toolbox they were made of * Remove random newline --------- Co-authored-by: Adrer <[email protected]>
* Various chemthrower fixes * Slight tweak * Fixes extended thrower * Fixes * Slight examine tweak * Name tweak and a fix
* Makes the cryo anomaly more dangerous * Reduces the amounts for vetus * Update code/game/objects/effects/anomalies.dm Signed-off-by: Luc <[email protected]> --------- Signed-off-by: Luc <[email protected]> Co-authored-by: Luc <[email protected]>
* salvg * Update code/game/objects/items/salvage.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/game/objects/items/salvage.dm Co-authored-by: Taurtura <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/game/objects/items/salvage.dm Co-authored-by: Taurtura <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> --------- Signed-off-by: PopeDaveThe3th <[email protected]> Co-authored-by: CRUNCH <[email protected]> Co-authored-by: Taurtura <[email protected]>
* whatever the fuck brat summer is i guess * admins should get it too i guess * i forgor tgui build for lightmode * Update code/modules/admin/admin_verbs.dm Co-authored-by: BiancaWilkson <[email protected]> Signed-off-by: Contrabang <[email protected]> * Update code/modules/admin/admin_verbs.dm Signed-off-by: Contrabang <[email protected]> --------- Signed-off-by: Contrabang <[email protected]> Co-authored-by: BiancaWilkson <[email protected]>
* rapier-rebrand * extdesc change * indentation * Update code/game/objects/items/weapons/melee/melee_misc.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Christasmurf <[email protected]> --------- Signed-off-by: Christasmurf <[email protected]> Co-authored-by: Burzah <[email protected]>
* Emissive mechs * I accidentally touched the Durand * old_durand lightmask * Phazon open sprite upgrade * Move emissives to seperate file * Add unique emissives for dragon armour ripleys * Edge cases for updating overlays * Changed number to a define * Added Autodoc --------- Co-authored-by: [email protected] <[email protected]>
…ntents (ParadiseSS13#26717) * no stealing batons * belts too * kick that unit
* framework * factions and objs done * objective framework * remove you_are, implement intro_desc * assassinate syndi text * remove extra space * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Implement steal items * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> * revert forced escape obj * rename i var * readd martyr check * difficulty defines * remove discounts * add electra dynamics * add hawkmoon * repath org, add gameplay blurbs * cuts unnecessary content, add org selection, updates * move defines * var names * update numbers * set defines, tweaks * add hijack forced obj * update L O R E * remove forgotten todo * document steal_list * use initial() * fix comments move steal objs * apply code review suggestions * use pickweight * flags * replace hardcoded target jobs by target_department * comment fix * incorporate org objectives into delayed objectives * fix martyr check location * Remove abuser vocab, debug names for orgs * readd obj name as user, VV only * add traitor panel and fix forced objective * reword ARC objective * change forced objective to list * rewrite to US spelling * Rework objective selection * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: datlo <[email protected]> * add hunter notification, review stuff * Update code/game/gamemodes/objective.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: datlo <[email protected]> * fix lists * Updated captain's sabre typepath Co-authored-by: Burzah <[email protected]> Signed-off-by: SteelSlayer <[email protected]> --------- Signed-off-by: datlo <[email protected]> Signed-off-by: SteelSlayer <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: SteelSlayer <[email protected]>
…26493) * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Much Work * CI * OSHA Exit Sign * CI * CI * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * CI * CI * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Removed accidentally duplicated pipe. * Update cerestation.dmm * Update cerestation.dmm * CI * CI * Update cerestation.dmm * Update based on review * Makes all service intercoms into cardinal bumps * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * fixes an errant loot spawner * Update cerestation.dmm * Moves bar electrical delivery wire to maint. --------- Co-authored-by: Burzah <[email protected]>
…aradiseSS13#26646) * Update access.dm * Update access.dm
* fleshed out engi and asteroid * command work * more department fleshing out: sec * sec work * perma work * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * med and dorms fleshing out * sci and service fleshing out * Update EmeraldStation.dmm * APCs done + detailing * Update EmeraldStation.dmm * wire work * more wire work * wires and LIGHTS * ATMOS DONE now onto DECOR * AI/status monitors * intercoms and newscasters * Wall items and cameras! * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * moved the file to the correct area * bugfixes, starting up the map * refining the asteroid * merge fixes * logs of bugstomping * more bugfixing * bugfixing * bugfixin * trying to make the stupid lava work * adds plasma vent for test * more testing * swapped file places * vents work now! * Update paradise.dme * vent sprite update * file corrections * Asteroid MILLA changes * adds a new MILLA atmos type * Build MILLA * oopsie * fixes * removed testing code * reverts map start * reverts the atmos change * respriting geyser * comments * Update code/__DEFINES/atmospherics_defines.dm Co-authored-by: Charlie Nolan <[email protected]> Signed-off-by: Kyani <[email protected]> * Update geyser.dmi * Update paradise.dme * fixing past merges * adds some missing items from merges * reverting * reverts changes again * deleted unused file * oops forgot nearspace areas * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Update code/game/area/ss13_areas/engineering_areas.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Kyani <[email protected]> * Lots of map fixes * Update EmeraldStation.dmm * trying to unfuck the milla merge * removed station from dme * fixes/small tweaks/suggested changes * removed errant turret * redid telecomms * Update EmeraldStation.dmm * rebuilding everything * redoing security * more sec work * perma shaped up + more items * renamed properly this time * resetting atmos code * more secwork and move papers off varedits * more secwork + dorms + funeral services * added new areas + pipe/wires/floors * security electrified windows/wires/alarms/lights * cameras, dorms pipes/ires/alarms/apcs * merged * disposals * lots of wall things + added map datum for testing * pipe fix for linter * fiddled with maints * minor maint edits * fixes + maint work * more bugfix * even more bugfixing * MORE nearspace fixing * dumb nearspace fix * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: AffectedArc07 <[email protected]> Signed-off-by: Kyani <[email protected]> * a LOT of fixes + door access * disposal pipe update script * oops linter fixes * fixed viro button runtime * finished maints + space decor * removed hall light switches * fixed solars areas * removed errant lattice * remove agent B from asteroid * wall bump placement refining * apc fix * bugfixing * minor maint change * bugfixing * burn tile on node fix * changed official name * bugfixing * added genetics locker+figures * bug hunting (buttons mostly) * added firelocks. oops * added temp webmap + bugfix * Update emeraldstation.dmm * new webmap. again * added the perma tools * nanomaps * bug fixes, fixes, and more fixes * more tweaks * cable fix * more bugfixing * Update emeraldstation.dmm * tiny fix * fix AI sat turrets * more bugfixing * MORE bugfixing * bugfix + ruins soundfile * pipe bugfix * fixed toxins pipes. junctions bad? * swimwear :) * remove errant QM gps * rnd shutter button missing * potato layering fix * add bridge request console * fix window tint in interrogation * added some clothes * nanomaps2, asset boogaloo * modified an empty hall, added some perma cams, minor fixed * forgot to save before push oops * widens sci maint hall + bugfix * gives theatre its autodrobe back! * moved borg spawns * moves nuke op default spot * new asteroid mix + botany tweak * adds cremator button * new sign + moved pod + bugfixing * cable fix * engine, sci chem, and surgery tweaks * more bugfixes and tweaks * more tweaks * adds a few windows back to robotics * bar was missing pun pun! * corrected misplaced atmos machines * re-added the bathroom * fixes atmos waste disposal injector * modified mr potato * changed bathroom area * minor toxins tweak * small wall decor tweaks * removes errant lights * removes errant opier * LOTS of fixes/tweaks + adds CO2 to asteroid * gave maint some boxes + cable fix * duped brig lock * adds masks to medbay storage * adds missing gues passes * cleanup from kitchen rework * gives solars enough glass to complete it * adds another defib to cryo pods * makes asteroid sign fireproof * perma maint now opens with virus + bugfixs * bugfixing + adds missing holopads * more holopads + bugfix * adds some smoke vendors * kitchen area tweak * fixed errant rack * rearranged/spread out cig vendors * moved a cig machine again * added RD tint button * undid a brig area change * removed errant posters * added filing cabinets + bugfix * maint morgue tray fix * adjusted chapel + bugfix * fixed palms + minor sec floor tweak * adds forgotten magi and clown starts * gave engi a shower * reworked robotics + atmos bugfix * geysers now work at 1/10 capacity when overpressure * bugfixing + tweaked overrides/variables * rework warden office * bugfixes + adds some holopads * added missing bio shutter * more small tweaks * adds RnD rework + gives mag some things * fixed fabricators * tweaked robo + added rnd server board * added rnd backup circuit * bugfixing * bugfixing again * bugfixing * fabricator fix --------- Signed-off-by: Kyani <[email protected]> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Charlie Nolan <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: AffectedArc07 <[email protected]> Co-authored-by: S34N <[email protected]>
* The cloner once again mulches people on emag or emp * it has to be after each if, as the circuit board and beaker are passed as a stock part * Update code/game/machinery/clonepod.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * Update code/game/machinery/clonepod.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * merges it * istypesit --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: 1080pCat <[email protected]>
* anchors reflectors on 2 maps to not troll engineering * anchors on mapload
* removes hoverboard from SOO * comma
fixes ParadiseSS13#10334 "Blood crawling slaughter demons make rubber duckies squeak" fixes squeak component being confused about what is the crossed and what is the crossing atom prevents some potential runtimes in play_squeak_crossed
* Deletes old meter icon I HATE SPRITES THAT ARENT WITH THE REST OF THEM * Resprites GAS METER (Fixes unchanged icon) Hidden secret gas meter that isnt with every other gas meter
…ParadiseSS13#26641) * Engineering jumpsuit resprite/refresh * Engineering berets resprite/refresh * CE mantle resprite * Grey CE pants consistency fix
github-actions
bot
added
🗺️ Изменение Карты
m-dzianishchyts
added
the
📃 Требуется изменение WIKI
github-actions
bot
added
Кибериада
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
fe95a69
to
2a7aa64
Compare
Legendaxe
approved these changes
Sep 14, 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.
Что этот PR делает
Мергес апстрим.
Changelog
🆑 ParadiseSS13
add: Добавлены организации Синдиката.
add: Цели агента теперь зависят от организации, к которой относится агент.
add: Антагонист может предчувствовать, что является целью другого антагониста.
add: Добавлена новая станция - ИСН Диагорас (EmeraldStation). Пока не в ротации, возможно наныть у администратора.
tweak: Платы консоли резервного копирования и контроллера сети РНД добавлены в защищенное хранилище плат.
tweak: Крио аномалия стала гораздо опаснее. Количество снарядов и холодного газа увеличено.
tweak: Время сбора Эскадрона Смерти и ССТ снижено до 45 секунд.
tweak: Емагнутая клонерка теперь гибает. Клонерка под ЕМП гибает с некоторым шансом, который снижается при улучшении.
tweak: У ОСО из рюкзака убран ховерборд.
tweak: Капитанская рапира переименована в капитанскую саблю.
imageadd: Добавлен спрайт для капитанской сабли.
imageadd: Добавлена подсветка мехов в темноте.
imageadd: Респрайт формы инженеров.
fix: Администрация снова слышит звуковое уведомление о молитве.
fix: Исправлена проблема с передачей энергии из СМЕСов.
fix: Флорботы теперь используют цвет тулбокса, из которого они сделаны.
fix: Исправлены некоторые ошибки, связанные с химическими огнеметами.
fix: Поместить предмет на конвейерную ленту или в мусорку теперь можно только в хелп интенте.
fix: Доступы на пультах РД и КМа теперь соответствуют их доступам на картах.
fix: Отражатели теперь прикручены к полу раундстартом.
fix: Исправлена ошибка, при которой демоны могли наступать на уточек или мышей, что сопровождалось звуком.
fix: Исправлен спрайт счетчика газа.
/:cl: