* 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
* Smith role, access, access helpers, spawn point, comms, and IDs
* Area defines
* Hammertime
* Cyberiad Smith's office
* Forgot some atmos stuff
* Autolathable Hammers
* Formatting
* Toolbelts can hold hammers
* Initial work on smith machines
* Farragus Smith Office
* Placeholder sprites, mapping
* Smart hopper points and console messages
* More work on smithing machines
* Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access
* Smith components, new materials
* New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation
* Missed one
* Grrr map conflicts begone
* Dirt begone
* Casts and smelting
* Linters
* Attack chain linters!
* Better grip to throw people into your industrial machines
* Placeholder spots in the DMIs
* UpdatePaths - Space ruins now spawn new space ores in their rocks
* Small changes - removed excess tgui code from hopper
* Fixed a button on emerald
* Attaching inserts and lenses. Tool bits are pain.
* Tool bit initial implementation
* Merge conflict resolution
* Attack chain grrr
* Fixed a pair of minor mapping issues
* Tool bit implementation, efficiency, failure rate
* Hot things burn hands
* Points fix on hopper
* New mining rocks for space exploration
* Areas on asteroids
* Machinery icons 1
Adds basic icons for the new machinery
* Vendor iconstate update
* Crucible touchups
* Hammer touchups
* Crucible Input Animation
Adds an animation when you deposit ores
* Added scanning the crucible with multitool to get mineral count
* clothing sprites part 1
* locker sprite
* job icons
* garment bag
* Smith locker mapping
* Insert and Bit removal fix
* Job menu alignment fix, Allowed_items and small spriting path fixes
* Adds new asteroid ruins to config
* Ore Sprites
* Hammer Sprite
* Item Sprites 1
* Sheets, Wall Ores and Trim
* Sheet iconstate names
* species uniforms
* Tabs
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Lens spelling fix
* Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs
* Fixed type lists
* Smithing machine bug fixes.
* Fixed adding modifications to items
* Crucible Lava Idle
Adds an idle animation for the crucible, but it needs overlay code to work.
* Fixed eguns
* Magma Crucible overlays and animations
* Machine broken/Off states
Adds broken, wires exposed (and on/off where appropriate) states to machines.
* Castivend recolor and Hot Items
* Overlays for all machines, new sprites for hot items, new checks, fixes
* Woe, farragus merge conflict
* update_appearance linters
* I have fat fingers.
* Forgot one
* transfer_item_to and qdel null check
* Usr to User
* Modsuits should not have inserts.
* Adds casting lip overlay
* Balance pass on movement debuffs and buffs
* Material movespeed changes
* Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE
* Math fixes for lenses and bits.
* Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums
* Bad var. Bad.
* Various fixes to bugs revealed in initial TM
* TYPO
* Lavaland base turf fix
* Paths in examine fix
* Adds an intercom to the workshop.
* Stamina-hybrid damage oversight fix for det revolver, uion, etc.
* Currently Operating Message fix
* Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.
* Armor and upgrade fixes
* RCD tool bit equip fix
* Adds smith access to a few lists in access.dm that were missed in an oversight
* Indent fixes
* Fixes vending machine, allows tool bit use on mining equipment
* CI, you make me mad sometimes
* Removed duplicate code
* Name fix for CI again
* ORM now can handle space ores
* Adds space ores to Vetus drop and to trader inventories
* Fixes runtime with open hand attacking a lava furnace with nothing in it
* Adds crewvend kit to Castivend
* Fixes not being able to see new ores
* Adds drill and RCS to smith locker
* Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.
* Plant fixes
* Fixes doubled-up catwalk
* Emerald cargo windoor fix, small lavaland adjustment
* Small oversight for overlay fix
* Missing lightswitches
* Fixed stock parts mismatch in casting basin recipe
* Better support for power tools, grrr attackchain
* Better attack chain handling. Better handling for bit insertion
* Fixes handling of inserts with storage suits (like labcoats)
* sprites for bomber + plasmeme outfit
* Adds missing adjacency checks
* Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.
* Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.
* Small hallway adjustment
* Illuminates metastation smith office
* Removes excessive decimals in magma crucible scan output
* Berserker should not have inserts.
* Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly
* Adds smith bomber jacket to loadout panel
* Adds random spawners for smithed items, adds random low-quality items to maints loot
* Adds traitor version of bulldog shotgun
* Revert "Adds traitor version of bulldog shotgun"
This reverts commit 1d39c59f07.
* Added check to assembler, moved desc changes to examine()
* plasmaman suit fix
* Fixed hot check when removing items from hammer and furnace
* Remaps lavaland workshop, fixed deltastation light switch
* Improper's the smith office name
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Compacts extra ore drops from Vetus
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* better looping
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Better loop
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
* Multitools don't need tool bits.
* Better variable names, fixed missing parenthesis
* Recursive hammering, removed attack animations when inserting items or using multitool on smithing machines
* window
* Update deltastation.dmm
* Update deltastation.dmm
* Update deltastation.dmm
* Fixes small oversights
* Minor lavaland remap
* Reverts TM-required changes in preparation for full merge
* Begone, stray font!
* Damn you cable CI
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* death to the OGG
* lint
* adresses issues
* nukes shells
* sounds should still stop even if you muted someone
* Update code/modules/admin/verbs/playsound.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
* deconflict
* as mentioned
* minortypomoment
* i prefer this wording
* updates catches and moves admin logging.fixes span
* fixes another weird edge case with muting admins
* 516 support
* linters?
* further idiot proofing
* typescript player update
* more typescript player updates
---------
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* Can pick paraplegic in character menu, will start floored+wheelchaired
* Why won't you show up on scanners
* Forgot the description.
* Got the scanners to show Paraplegia!
* block off some roles from paraplegics
* Use stance instead of the floored trait for paraplegic
* Prevent paraplegics from using/being hit by legsweeps, change get_num_legs()
* Add DNA injectors for paraplegia
* change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps
* Can pick paraplegic in character menu, will start floored+wheelchaired
* Why won't you show up on scanners
* Forgot the description.
* Got the scanners to show Paraplegia!
* block off some roles from paraplegics
* Use stance instead of the floored trait for paraplegic
* Prevent paraplegics from using/being hit by legsweeps, change get_num_legs()
* Add DNA injectors for paraplegia
* change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps
* whoops.
* TGUI.
* How did I miss that in testing
* Add the point interaction that nuggets get to armless paraplegics
* Update code/modules/mob/living/carbon/human/human_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
---------
Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Scribble-Sheep <15377810-AlyxisDrayko@users.noreply.gitlab.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* add: slimify icon proc, clamps L in HSL.
fix: skin tones, corrupted character slots, species subtype accessories, and spawning without the proper DNA set.
character creator fixes.
reduces the eye strain from super bright slime people :pain:
* fix
* Port /tg/ move manager, drift and jetpack components.
* don't add go through newtonian movement if not moved to a turf
* various cleans for blood drifts and mob speed
* fix slow meteors
* why on fuck's earth aren't speedbikes vehicles
* style lint
* also wtf
* okay i'm an idiot
* fix meaty ore speed and blood decal double stepping
* fix not unbuckling pulled object occupants
* don't bother dealing with immovable rods just yet
* exclude bubblegum and vetus from move manager for now
* fix issues related to null weightless blood icons
* reset blood icon state properly
* fuck it, we'll deal with mobs when basic mobs happen
* break infinite loop in decal splat
* 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 <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* 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 <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* 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 <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* refactor: Rename all non-snake_case types (not procs or vars (yet)).
* completely dynamic update script
* might help to include the data
* update aa's scuffed python
* oh
* set script PR number
* run updatepaths again
* Add other table updates with JSON columns
* bump SQL version
* just fucking end my life
* move JSON data
