* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.
* Appease linters with static typing?
* Add juice box box. It's a variety pack.
* Add trailing commas to positive quirks as requested.
* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.
* Add juice box variety pack supply crate.
* Make juice box storage even fancier.
* Thanks, linters!
* Thanks, linters! part 2
* Give the pre-packaged juice boxes a brand name.
* Apply whitespace suggestion from review.
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* add dark flash toggle
* check for client
* remove string shenanigans, makes the dark flash path a var
* rename type argument to something that doesn't belong in an asylum
* Makes the datum
* Initial Commit
* Gets TGUI menu not crashing
* Autodoc
* quirk menu bugged
* oh.
* Working menu + buttons
* trait defintes pt 1/?
* Moves traits around
* ACTUALLY START ON THE QUIRKS THEMSELVES
* TGUI Bundle Rebuild
* TGUI properly saves now
* Removes allergies for scope reasons, make foreigner work properly
* TGUI tweaks
* Reworks TGUI Menu
* quirks store the mob, not mind
* Adds asthma and mute
* minor tweaks
* Cloning re-adds quirks
* Adds functionality to frail
* Adds crafty
* TGUI fix
* Fixes a frail bug
* Makes sure the list is in the correct format
* TGUI size change
* Makes skittish work
* Adds glutton, removes unused traits
* Changes description and adds function to glutton
* Freerunner functioning
* Crafty buff
* Clear quirk list when changing species
* Forgot to remove light step
* Delete
* Refactor item-giving
* TGUI Bundle Rebuild
* whoops
* Apply quirks when changing species
* Removes some unneeded defines/paths
* Replaces improved charging cord with a bad charger
* coment
* Guard clause
* Changes how quirks add and remove organs
* unused var
* adding organs works, removing them doesn't yet
* oh that fixed it
* Hopefully finally once and for all fix the json issues
* Buffs asthma
* switches the processor to ssobj since it's slower
* actually spawns the items whoops
* maybe actually fixes json issues I really hope this doesn't come up again?
* moves sql to the right directory
* CULPRIT FOUND, JSON ISSUES ACTUALLY SOLVED
* adds admin tooling for quirks
* Ups the cost of lungs
* Adds removal for the drinking ones
* Fixes some duplicate code
* Removing foreigner works
* wops
* bumps sql version to 65
* prettier
* semicolon
* Foreigners can understand galcomm but not speak it, as per headmin request
* Different solution was agreed upon
* CC announcements now get auto-translated
* Apply suggestions from code review
Lewc quick suggestions
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Move alcohol tolerance basetype
* accomodates for reset_styles
* Swap to species flags, and being dead is a universal process stopper
* adds a foreigner trait
* Xenos and the like can't understand CC's translated announcements
* TGUI Bundle Rebuild
* Lewc quick fixes
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* i forgor
* i forgor pt 2
* process properly returns true
* TGUI Bundle Rebuild
* sql update for fixing merge conflicts
* bundle changes
* actual sql fix
* Not test tiny in prod
* sql fix?
* tgui update, first pass
* Adds schema changes to main quirk branch
* persistent data works now
* TGUI Bundle Rebuild
* Fixes conflict with job assignment datumization
* TGUI Bundle Rebuild
* Adds pacifism by request, -3 points
* gives skittish a small cd
* Makes the lunch randomizer I was thinking about doing
* GC returns a qdel hint now
* Removes hard refs
* SQL save fix
* Fixes admin tools
* Fixes wizards getting quirked up
* ragin too
* Lightweight is more lightweight
* Adds admin logging for when someone makes a languagesless character
* TGUI Bundle Rebuild
* Adds colorblind, hungry, and buffs asthma
* fixed vv post-merge conflict
* behold, my monster
* rebuild and merge master
* Adds more positive quirks, and makes monochrome give more points
* adds nearsighted, and no whispering
* sorry linter
* Adds the cool quirk, thanks to pumpkin312
* Oh dear that signal gets sent to everyone every time someone spawns in
* i forgot that slimes dont have eyes
* tgui fix
* bundle rebuild probably
* prettier
* prettier
* Skittish package fix
* force add bundle
* Makes plasmemes be unable to take foreigner
* Makes advanced lungs respect the owner's species
* makes breaking open wrapped crates/lockers a do_after_once
* Makes plasmeme/vox advanced lungs actually help
* You get glasses anyway whoops
* bundle rebuild
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
* Copied and fixed code from issue #29597
* fixed whitespace, make linter happy?
* okay LAST whitespace
* comments with hopefully enough information + whitespace fix
* code and icons
* file renaming
* vendor prices, apron/overalls obj icons, species sprites
* species head sprites because thats a thing
* loadout inconsistencies fix
* vox have their own apron and overalls sprites so i added those. oh the lengths i go for you botany
* loadout 2: return of the inconsistencies
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* maybe fixes merge conflict?
* merge conflicts are so annoying holy shit
* sick of this dme junk
* remove unrelated change
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* merge conflict test fix
* super merge conflict fix
* fix drask syndiberet
* actually fixes drask syndiberet
* super ultra final beret fix
* Update loadout_uniform.dm
---------
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
* add sprites
* obj
* CMO turtlenecks
* turtle code
* CODE
* everythig
* fixes
* HOP FIX
* super fix ultra fix look at this fucking fix
* done
* config fix
* tiny fix
* test
* test 2
* desc
* hop desc
* Move all the non-weapons out of code/game/objects/weapons (#29820)
* Update bartender mob and obj sprites for relevant species (#29889)
* Update bartender mob and obj sprites for relevant species
* Add bartender uniform rolldowns, inhands. Minor color fixes.
* Revert "Update bartender mob and obj sprites for relevant species (#29889)"
This reverts commit afc4389871.
NVM
---------
Signed-off-by: Seren Highwater. <102489377+SerenHighwater@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
* Make DB admin ranks more useful
* Avoid error message when cancelling permission toggle, allow adding localhost admins as real admins.
* Lint.
* Don't SQL error when a previously-unseen player connects.
* Use ckey of permission editor, not mob name.
* Strikethrough
* Order in the list.
* Deadmin, readmin, and 2fa.
* Correct merge error
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* 300 > 120
* ooooh i don't need sql change
* same but descending + fix issue about DB
* well, i should update bd
* default is 100, keep only divisors of 1000
* fuck you byon d!!!!
* cleanup
* Creation
* refinement
* so many icons aghhhh
* The Revival
* e
* it continues (again)
* Lots of progress!
* I hate species sprites so much
* fuck
* Update fancy.dm
* Update fancy.dm
* Update cigs.dm
* attack log
* Abstract cigarette
* Update fancy.dm