Conversation
A generous attempt by Inorien to fix our CI suite
* new sprites * Update 64x64.dmi
* the pr it self * "texLen"
…fixes (vlggms#3077) * paradise * twilight rework and goldrush dash to nilih version * event egos moves, sswts nerfed and waxing pixion * a bunch of changes * feather and twilight changes * for the love of god cox you fucked up all variable stun time weapons * Update _ego_weapon.dm * mimicry/mockery's sword forms now heal on hit, other forms buffed * minor slash changes * paradise lost fixes and new graphics, removes hammer mockery double hit and buffed mimicry scythe to be more on par to mockery hammer * buffed scythe mimicry's aoe more and removed the stun time from it * fixed small bug and sword mockery has a large sweep * Update aleph.dm * nerfed scythe aoe and fixed slash formula * combo weapon nerfs + attempted jump attack fixes * makes stunning weapons without range a bit stronger * holy shit kirie can't be trusted to make weapons after making infinity * Update waw.dm * Update waw.dm * Update waw.dm * paradise and nihil weapon changes * Update special.dm * slight changes * minor pl and gr but readds that one attack to twilight * minor tweaks * Update teth.dm * Update waw.dm * Update waw.dm * Update waw.dm * Update aleph.dm * Update special.dm * Update special.dm * more linter fixes * visual_attack_speed and iron maiden fixes/changes * Update special.dm * visual_attack_speed to modified_attack_speed * Update teth.dm * Update weapons.dm * Update special.dm * paradise grpahics changes * Update special.dm * reverts twilight * Violet Curse Stat changes * creative freedom rework and new sprites * fixed u turn * Update color_fixer.dm * conflicts * Update special.dm * Update special.dm * Update special.dm
…ggms#3115) Containment cells de-standardized
* early part of the rework * fairy changes,flowers,and ni * finished the changes * lag fixes * Update titania.dm * Update titania.dm * Update titania.dm * calls death instead of destroy * sprite fixes * Update effects.dmi * test * early part of the rework * finished the changes * Update effects.dmi * Update laetitia.dm * reworked titania's work mechanics * Update aleph.dm * Update aleph.dm * Bug fixes and new additions * Update titania.dm * Update titania.dm * lowers titania's qliphoth to 2
new whale ordeals adds noon and temporary dusk adds whales to random rock spawns Apply suggestions from code review unneeded return statements Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> mermaids of the thousand strands now deal black damage Adds mermaid and whale meat
some small fixes adds some more stuff adds a pink shoes observation mucho texto teddy_obs kikimora update portraits tangle gaming fixes pink shoes entry Adds two missing portraits new portrait Co-authored-by: Coxswain <Coxswain-Navigator@users.noreply.github.com>
Co-authored-by: Coxswain <Coxswain-Navigator@users.noreply.github.com>
removes black sun max PE update fixes clayman fixes doomday fixes Co-authored-by: Coxswain <Coxswain-Navigator@users.noreply.github.com>
Removes unnecessary options Additional misc changes + sanity changes Removes some quirks, normalizes limbs Removes unneeded DNA changes removes excessive blurbs Removes light tube damage
* player stacking * Update human.dm * Update human.dm * non insane players can be ontop of each other no matter what * is disabled on combat maps * I fucked up linters * Update human.dm * undid the combat check * Update human.dm * hopefully fixed collision * removed swarm * intent changes
…t and other shield giving weapons (vlggms#3114) * Sheilds! * Update ego_weapons.dm * Update ego_weapons.dm * linter fizes * name changes to shield vars and punctuation fixes * more changes * reworked moonlight again * Update waw.dm
Medbay improvements
Reduces shuttle arrival time
* testing needed * Update mob.dm * ordeal addition * bug fixes * end of round changes * rewrites some things * fixes * Added a check to make sure a defeated super boss wasn't already in the list * minor fixes * fixes and a less stupid way of going about getting the amount of githers * made gathering super boss info less stupid * final changes * really final
Enkr repair ordeals comment removal
* nerfs * apoc bird changes andbirds wont hurt the portal or apoc * Update punishing_bird.dm
* I hate this * it actually works * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js * Update DecalPainter.js
* Update cleaner.dm * Update dealerdamned.dm * Update kikimora.dm * Update forsaken_employee.dm * Update dingle_dangle.dm * Update my_sweet_home.dm * Update penitent_girl.dm * Update simple_smile.dm * Update skin_prophet.dm * Update space_lady.dm * Update staining_rose.dm
* HP rebalance, bugfixes * adds the enemy panel added the enemy panel removes comments and crazy code nerfs fairy festival nerfs WCCA reverts the fairy queen max
Update we_can_change_anything.dm
Nerfs panics stuff minor change
* E.G.O adjustments Starting with feather of valor! # Conflicts: # ModularTegustation/ego_weapons/ranged/waw.dm fell bullet and fell scatter done New ego renames lucid nightmares stuff crashing curse # Conflicts: # code/datums/abnormality/_ego_datum/he.dm KQE rename adds effects to lucid nightmares adds LCE ego map changes and linters Finished lucid nightmares sanitizes text for extraction more ego renames * re-maps 9:2 into U corp extraction department removes comments * Replaces rending status with a /display type
* Forsaken employee revision # Conflicts: # code/modules/mob/living/simple_animal/abnormality/teth/forsaken_employee.dm * fixes linters lowers hp
* reworked arbiter * Update extraction.dm * I fucked up goobster * Update extraction.dm * Update extraction.dm * got rid of old arbiter image locations * fixes and removes uneccisary vars * description removal * coflict changes * Pillars deal reduced damage to working agents
* stuff * sprite and enkephalin changes
* better tips * Update jobtips.txt * Update jobtips.txt
* s * d * Update elevator_hell.dmm * Update elevator_hell.dmm * d * Update _basemap.dm * Update elevator_hell.dmm * Update elevator_hell.dmm * Update elevator_hell.dmm * d * Update elevator_hell.json * Update elevator_hell.dmm * Update elevator_hell.dmm * d * Update lobotomy-corp13.dme * Update elevator_hell.dmm * d * Update elevator_hell.dmm * d * Update elevator_hell.dmm * x * Update elevator_hell.dmm * fixed dmi conflcit * fixed clerk guns not showing up * elevator hell is now mcorp and made the mid pop 18 * Update maps.txt * Update elevator_hell.dmm * Renamed most elevator hell files to Mu * Mi now has an abno chem area to saftey * also added extraction shoot * Update elevator_hell.dmm * fixed multiple grates on the same turf * Update elevator_hell.dmm * fixed some decal clipping and camera blind spots * Mu now has a disc office in disc * Update lobotomy-corp13.dme * mapping changes * made disposals less stupid * Update elevator_hell.dmm * Fixes utter stupidity on my part
* start * Update unsorted.dm * minor changes * Did the port * fixed debug code * stuff * fixed positioning
* paradise * I realize how many issues bb had * Update abnormality_queue.dm
* removed map * Removed most of Limbus company labs stuff
* changes * Update abnormality.dm
…p to its lower melee damage (vlggms#3170) * steam machine fix * Update steam_transport_machine.dm * its lower melee damage isnt 5 * Update steam_transport_machine.dm
* Update sprite_accessories.dm * Update sprite_accessories.dm
* work damage stuff * Update abnormality_queue.dm * Update red_buddy.dm * number changes * last shot nerfs * Update code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> --------- Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com>
Removes unused prefs
jangsan no longer deletes heads Changes to player deletion jangsan no longer deletes heads fixes death reverts stuff
…ms#3162) * base stuff * added stuff for other weapon types * Shotgun support and charge text changes * Update _ego_datum.dm * fix discord description * modified_attack_speed will now replace attack_speed if an ego weapons has it defined * run time fixes * Revert "run time fixes" This reverts commit 9fa5226.
fixes duplicate
* Agent outfit changes replaeces senior role * Replaces most instances of "Agent Captain". Also forces armbands to match the role fixes role and ID HUDs # Conflicts: # code/modules/jobs/access.dm # code/modules/mob/living/simple_animal/bot/cleanbot.dm * Reinstates agent captain as the default title, prevents it from displaying Fixes prefs display spacing after a comment
…#3127) * changes * Mare changes * start to changes * more abnominions * more abnominion shit * Update little_prince.dm * Update ore_turfs.dm * grammar stuff * Update CommunicationsConsole.js * Update CommunicationsConsole.js * Many fixes and changes * I fucking hate the 80 character limit * Update lobotomy-corp13.dme * Update test_range.dm * Update CommunicationsConsole.js * Update CommunicationsConsole.js * Update CommunicationsConsole.js * Update _aminion.dm * Update lobotomy_emergency_level.dm * fixes it? * Update lobotomy_emergency_level.dm * Update lobotomy_emergency_level.dm * Update lobotomy_corp.dm * 1000th attempt of fixing * changes * Made it a bit less of a mess * fixes mistake * made ordeal data less shit * combining 2 systems * more changes * nearly done just some other shit I need to do * more stuff * Fixed linter stuff when rebasing * more fixes * finishing the changes * linters * Update lcorp_er_ver.dmm * Update lcorp_er_ver.dmm * minor fix * Final Fixes * lighting changes and ordeals now count for activating the lights * My attempt to be smart caused a shit ton of lag * Officer Fix * Update game_options.dm * falada and gots' minions are now aminions * undid falada * Update seasons.dm * Update code/controllers/configuration/entries/game_options.dm Co-authored-by: Mr. Heavenly <36343755+vampirebat74@users.noreply.github.com> * Grammar fixes and minor changes * Update rose_sign.dm * Update lobotomy_corp.dm * Update lobotomy_corp.dm * fixes * fixes * Apoc changes * pull force stuff and apoc fixes * Update _aminion.dm * debug text removal * Massive overall changes, hostile has new variables, and changes to mfe, ordeals, yang, friendly breachers, and few other things * sirocco and meat lantern stuff * fixed lights being broken with big bird * Hostile changes and fixes * Moves emergency variables to aminions and abnos, aminions have an argument in initialize for if they shouldn't effect the yste, and some fixes * added some new sounds depending on the level * fixed sounds * Fixed fucked up clamping and prevents the trumpet from resetting while a shuttle is being called * grammar changes * Update waw.dm * Update _aminion.dm * Update lighting.dm --------- Co-authored-by: Mr. Heavenly <36343755+vampirebat74@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
a