mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
0fda5cfc6a
* why no work angy * weird errors shit sucks * fixved it I can spell good * fix? POSSIBLY * nope wasnt this * no more immutable thhanks koffee * ok ok * removes all the pref stuff ""removes"" * remove this idiot * this goes bye bye * these go too genius * bye bye * better night vision * tries to fix camera maybe * ok fuck it we ball we ball * ok lets go back go back go back go back * WORK DAMNIT * ha fuc kyou * this maybe * this doesnt work :( * maybe fix maybe * fucks everything why do i do this * test update test * Revert "tries to fix camera" This reverts commit2d14fbae66. * reverts everything I just did peko pain * bye bitch * oh yeah add this I guess * Fucks up the camera net + chunk why * test maybe revert * Revert "test maybe revert" This reverts commit98c5ef1b93. * Revert "Fucks up the camera net + chunk" This reverts commit0e421ebf5f. * this isnt going well uh oh * Attempts to rework out security camera and probably more * Revert "this isnt going well" This reverts commit1d8ceac867. * Revert "Revert "this isnt going well"" This reverts commite26fb61415. * ok ok * Revert "ok" This reverts commit7e7a7f8372. * Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit" This reverts commit01094731c1, reversing changes made toc0cf69ebf1. * this doesn't need to be redefined I guess * no we need this totally * a familiar pain * 515 is L * yeah yeah * ok god fine * bye bye basemap :( doesnt work on runtime station * Fixes AI statis not working god im good * remove this oh god * Revert "Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit"" This reverts commitb3fb3ba0db. * proves to god I exist and im pissed * yog exclusive feature (tm) plane master * bring this back from previous push * updates vendor emissives as well as firealarms * Updates barsign and fucks everything up * Fixes barsigns breaks all lights and updates barsigns to be machines and not structures We will address this in a later patch * not sure who changed that oh well * yeah this got moved * this needs updating yeah * turns off the carbon monoxide alarm duh * FIXES IT YES thank you biome * turns this off too yeah * Can't compile yet but ports a ton of shit * L * the game opens ig * extra shit * fixes * signals and smooth queue * look ma im going horribly out of scope * fixes chasms * this fixed nothing * ??? * more barsigns for later * forgive me cowboy. also fuck diagonals * oops we need this apparently * fuck it we ball * Update _lists.dm * Update icon_smoothing.dm * it now works kinda * Update atom_initializing_EXPENSIVE.dm * lighting don't work * we have light * sort turfs better * big fucking reorganize * like everything except templates * boy i sure hope nothing bad happens to these bar templates * we're back * no runtimes baby * no errors * shuttles are almost fixed i think * Revert "shuttles are almost fixed i think" This reverts commit046058827c. * Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing" This reverts commit863e1b776d, reversing changes made to884623e600. * Revert "no errors" This reverts commit884623e600. * too far back i think * midround smoothing runtimes fixed i think * comment cleanup * should fix the component runtimes * Revert "Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing"" This reverts commita8ff8d63aa. * NO RUNTIMES AND ICEMETA WORKS LET'S GOOOOOO * please stay fixed icemeta * organizing render dms * woops this too in the reorganizing * cryo fixed * nah, i'd win * parallax isn't my problem * pls don't break icemeta * runtime station gets a cam console * well it compiles * maybe fix the map * woops * man i hate maps * was that it? * PLEASE * missing focus tests * maybe that was it * maybe * let's take the batteries out of the carbon monoxide detector * fuck osha * i hate vending machines * that's not a computer * slot machine fix * PLEASE * that wasn't supposed to be there * fuck it i can't fix everything at once * BLUESPACE LOCKER? * literally why * hhh * does this fix chasms? * that should fix bad index * please? * turf_flags for reservations * haha oops * yolo (kill me) * fix wood walls and other walls * fix stairs * that might have fixed shittles * baseturfs are good now i think * should fix plasma windows * decals fixed * please fix changelog * shuttle lighting still fucky * lighting is stinky slow and doesn't finish updating by the time the server starts guh * lighting seemingly works * slipping works * shuttle sounds, slips, and windoors fixed * why am i here * fuck the changelog * of course someone touched smoothing as i'm almost done * we good? * updating ai_eye and rename * z updates and more ai cam updates * ice fixed * weather and ice fix * clockies can see and other clean up catches * windows fixed * cowbot forgive me i'm trying to update flashlights to tg because there's no light on lower multi-z z's like ice meta bottom floor * movable lighting works on multi-z * gps fix * item stacking from drag works * falsewall fix * job panel fixed * AI HANDLED * woops that comment should be gone * i hate ai i hate ai * brass glass visible again * vents on top of tiles now * sigdrobe sprite back * centcomm portals work * portals and see openspace mapping icons fixed * icemeta my behated * kill * is that it * lighting cutoff is old hat * angery overlay * not super necessary * also extra but whatever * ticker but thicker * job fix i hope * this isn't needed anymore * latejoin fix? * laserpointer, pipecrawl, and some consoles fixed * i hate fixing bugs as they're made * we're not ready for that * redef cleanup * gps arrows, gun flashlights, shuttle console placement, multi-z pulling fixed * goofy ah gun code * this was a good idea and necessary * should fix caltrop component * does this please the linter * linter please accept this async function * THERE * take the batteries out * make it stop * cowbot stopped me from letting ghosts dab * recycler loc fix * fix border firedoors not blocking movement * should fix screen fade out and fade in on round start and end * darker command tile trim and fixed bronze wall sprites * fuck you linter * railings actually stop you from leaving * probably fixes gibtonite overlay when struck * armaments dispenser and clockwork catwalk * turbine fix probably * pointing at inhand items should be fixed * fix overwatch app * should hopefully fix cable rotation on shuttle move * flashlights have better directionality logic * hopefully fixes shuttle atmos on move * grilles fixed * hopefully this fixes shuttle buttons, airolocks, and other machinery not working after moving * ice meta mining area finally not freezing * fix lightbulb icons not updating * lava mask and lighting dots * we actually have this * fuck glowshrooms GC * fix light fixture interactions and icon updates * hopefully catches all the updates * lava lighting good to go * seclite was missing inhands * smoothing in replays * light updates accurate in replays * biome's multi-z requests --------- Co-authored-by: cowbot92 <75333826+cowbot92@users.noreply.github.com> Co-authored-by: Molti <gamingjoelouis@gmail.com> Co-authored-by: Ringalong <53777086+JohnFulpWillard@users.noreply.github.com>
98 lines
3.2 KiB
Plaintext
98 lines
3.2 KiB
Plaintext
// Contains mob factions that are not handled by special role defines (for example, viscerators having ROLE_SYNDICATE)
|
|
|
|
// Default factions
|
|
|
|
/// Acts as a default faction for most violent creatures
|
|
#define FACTION_HOSTILE "hostile"
|
|
/// Acts as a default faction for most peaceful creatures
|
|
#define FACTION_NEUTRAL "neutral"
|
|
|
|
// Creature factions
|
|
|
|
/// Ashwalker related creatures
|
|
#define FACTION_ASHWALKER "ashwalker"
|
|
/// Megafauna bosses of mining
|
|
#define FACTION_BOSS "boss"
|
|
/// CARPS
|
|
#define FACTION_CARP "carp"
|
|
/// Creatures summoned by chemical reactions
|
|
#define FACTION_CHEMICAL_SUMMON "chemical_summon"
|
|
/// Clown creatures and the Clown themselves
|
|
#define FACTION_CLOWN "clowns"
|
|
/// Headslugs
|
|
#define FACTION_CREATURE "creature"
|
|
/// Cats
|
|
#define FACTION_CAT "cat"
|
|
/// Faithless and shadowpeople
|
|
#define FACTION_FAITHLESS "faithless"
|
|
/// Gnomes
|
|
#define FACTION_GNOME "gnomes"
|
|
/// Gondolas
|
|
#define FACTION_GONDOLA "gondola"
|
|
/// Slaughterdemons
|
|
#define FACTION_HELL "hell"
|
|
/// Hivebots
|
|
#define FACTION_HIVEBOT "hivebot"
|
|
/// Illusionary creaturs
|
|
#define FACTION_ILLUSION "illusion"
|
|
/// Creatures of the never finished jungle planet, and gorillas
|
|
#define FACTION_JUNGLE "jungle"
|
|
/// Small lizards
|
|
#define FACTION_LIZARD "lizard"
|
|
/// Maint creatures have mutual respect for eachother.
|
|
#define FACTION_MAINT_CREATURES "maint_creatures"
|
|
/// Animated objects and statues
|
|
#define FACTION_MIMIC "mimic"
|
|
/// Beasts found on the various mining environments
|
|
#define FACTION_MINING "mining"
|
|
/// Watchers don't like any creatures other than each other
|
|
#define FACTION_WATCHER "watcher"
|
|
/// Monkeys and gorillas
|
|
#define FACTION_MONKEY "monkey"
|
|
/// Mushrooms and mushroompeople
|
|
#define FACTION_MUSHROOM "mushroom"
|
|
/// Nanotrasen private security
|
|
#define FACTION_NANOTRASEN_PRIVATE "nanotrasen_private"
|
|
/// Mobs from the Netherworld
|
|
#define FACTION_NETHER "nether"
|
|
/// Mobs spawned by the emagged orion arcade
|
|
#define FACTION_ORION "orion"
|
|
/// Penguins and their chicks
|
|
#define FACTION_PENGUIN "penguin"
|
|
/// Plants, lots of overlap with vines
|
|
#define FACTION_PLANTS "plants"
|
|
/// Rats and mice
|
|
#define FACTION_RAT "rats"
|
|
/// Creatures from Space Russia
|
|
#define FACTION_RUSSIAN "russian"
|
|
/// Creatures affiliated with the AI and Cyborgs
|
|
#define FACTION_SILICON "silicon"
|
|
/// Spooky scary skeletons
|
|
#define FACTION_SKELETON "skeleton"
|
|
/// Slimey creatures
|
|
#define FACTION_SLIME "slime"
|
|
/// Spiders and their webs
|
|
#define FACTION_SPIDER "spiders"
|
|
/// Currently used only by floating eyeballs
|
|
#define FACTION_SPOOKY "spooky"
|
|
/// Statues that move around when nobody is watching them
|
|
#define FACTION_STATUE "statue"
|
|
/// Stick creatures summoned by the Paperwizard, and the wizard themselves
|
|
#define FACTION_STICKMAN "stickman"
|
|
/// Creatures ignored by various turrets
|
|
#define FACTION_TURRET "turret"
|
|
/// Vines, lots of overlap with plants
|
|
#define FACTION_VINES "vines"
|
|
|
|
// Antagonist factions
|
|
|
|
/// Cultists and their constructs
|
|
#define FACTION_CULT "cult"
|
|
/// Define for the heretic faction applied to heretics and heretic mobs.
|
|
#define FACTION_HERETIC "heretics"
|
|
/// Mainly used by pirate simplemobs. However I placed them here instead, as its also used by players
|
|
#define FACTION_PIRATE "pirate"
|
|
|
|
/// Generates a mob faction for the passed owner, used by stabilized pink extracts
|
|
#define FACTION_PINK_EXTRACT(owner) "pink_[owner]"
|