Commit Graph

1485 Commits

Author SHA1 Message Date
PollardTheDragon
cd7cb01a1f Meet the Smith - New Supply Role (#28273)
* 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>
2025-03-15 21:35:21 +00:00
Mira
a6e8f69c55 [PORT] Adds TG "busy" cogbar animation for players (#27932)
* looks like it works

* move to PREFTOGGLE_3 and add sneaky do_after

* linter

* param doc and some cleanup

* autodoc and comment signal

* fix wrong type in link_processing

* fix wrong var in preferences

* cover do_mob and do_after_once

* fix toggles total

* replace indent with space

* offset and helpers procs

* fix conditional statement

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/__HELPERS/mob_helpers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* use SECONDS

* Update code/game/objects/items/weapons/weaponry.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

---------

Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-06 16:04:51 +00:00
Bm0n
8bec408c29 Adds Play Internet Sound (#28183)
* 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>
2025-02-27 21:57:30 +00:00
Sheep
2e2a778a71 Paraplegia! (#27999)
* 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>
2025-02-12 22:36:22 +00:00
Bm0n
c11e1c969c Ports stop sounds verb from TG (#28072)
* sounds have been stopped

* update

* name and format update

---------

Co-authored-by: Bmon <no@email.com>
2025-02-12 21:38:48 +00:00
Spaghetti-bit
3fe1cd3521 Large patch to Slime/IPC PR - Character Creator + General Imitation Fixes (#28348)
* 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
2025-02-12 00:08:39 +00:00
Spaghetti-bit
313cf60c43 Imitation fix 2 (#28318)
* We all make mistakes in the heat of passion jimbo.

* Fixes corrupted save slots
2025-02-10 02:47:35 +00:00
Spaghetti-bit
2ca7c0fd7e Fix (#28308) 2025-02-09 17:50:58 +00:00
Spaghetti-bit
32c9d4d682 Slime People and IPC; Imitating Species Cosmetically. (#27359)
* Pain

* More transparency / alpha

* Vulp + Name override

* more transparency alpha stuff

* Reworks species subtype for slimepeople

* Iteration 3...

* Me when initial

* 60 - 61

* Character.dm select query changes.

* 61-62

* The real 61-62

* Update to IPC imitation

* +63-64.sql
> species_subtype after pda_ringtone

IPC identity configuration surgery.

Slime "Morph" action: 10 seconds. Allows a slime person to change how they look.
> Same cost as regenerating a limb.

Link processing subspecies implement.

* Pain2

* SQL

* Frankenstein monster fix

* Slimify! ...no longer applies to robotic limbs.

* 220 Alpha to 200

* Ordering issue fix.

* Last ordering issue.

* aa review, paradise_schema.sql

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2025-02-09 15:59:57 +00:00
warriorstar-orion
157276d6cb Port /tg/ move manager, drift and jetpack components. (#27698)
* 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
2025-01-22 22:49:58 +00:00
Kenionatus
97e99fe905 make all sec clothing in the loadout menu available to the detective (#27990) 2025-01-18 20:24:43 +00:00
ExusA
15e8d6cb71 Tweaked diona and fixed slimepeople eyes (#27950)
Removed the human eyes layered on top of dionea, and removed the option to change the color of diona and slimepeople eyes.
2025-01-14 13:41:22 +00:00
DGamerL
64c1977298 Makes the button more obvious (#27879) 2025-01-08 14:12:23 +00:00
Charlie Nolan
a218903eab Make character previews not stack trace (#27871) 2025-01-07 20:31:50 +00:00
Burzah
06940dd879 Adds 3 suits to loadout menu (#27758) 2025-01-06 17:33:42 +00:00
Bm0n
6a63097109 Converts a bunch of items into using neck slot (#27474)
* woe upon me

* update

* few changes

* critters

* critters

* THIS IS A CERTIFIED VOX CLASSIC

* removes comment from sql script

* i think i have a skill issue

* fuck

* TGUI Bundle Rebuild

* furcape

* attackby update

* cerefix

* buildstgui

* ajust size of loadout menu again

* tie layering toggle

* renames layer

* fucking map conflicts

* woe

* deconflict

* tgui

* conflicts again

* conflicts

* manual deconflict again

* oops

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* give this one more try

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review

* scarffixforemerald

* tgui rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-02 22:47:50 +00:00
Mikhail Dzianishchyts
d6259d924d Add customized welding helmets to the loadout (#27528)
* Add customized welding helmets to loadout

* Add Roboticist to allowed roles

* Remove fluff welding helmet
2025-01-01 04:07:39 +00:00
Pedro
b55bef2ed2 Nanotrasen Career Trainer - REVIVAL (PT1) (#26512)
* 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>
2024-12-30 21:13:52 +00:00
Drakeven
a5726efe0c Extra Plushies + Plushify Spell (#27384)
* Plushie PR

TODO-
Fix borgs becoming mind
Add to smite list
Add diona plush effect

* Fixed Issues

Added alien plush
Added loadout
Yeah

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

* WIP

Will finish later

* Fixed the various issues

Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite.

* Minor typo fixing

And stuff

* WIP Conversion

Converting all the attacks into more sleek attacks, will need to finish.

* Fixes galore

Yippie!

* Russian revolver wasn't working

now you can self-shoot again! Horay!

* You can no longer eat spraycans

IPC clowns everywhere devistated

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

* A tinsy bit of touching up

:)

---------

Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-12-23 16:09:24 +00:00
Kapu1178
7a29d77596 expand size (#27708) 2024-12-22 02:14:34 +00:00
Kapu1178
9b87bbd369 fit viewport (#27707) 2024-12-22 01:51:06 +00:00
warriorstar-orion
0ffa8303a7 Rename all non-snake_case types. (#27268)
* 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
2024-11-30 19:08:45 +00:00
Adri
fca84e2e7e Adds PDA ringtone to character preferences (#27365)
* Adds PDA ringtone to character preferences

* Two fixes

* Reset option

* Contra request

* DB update

* linter fix

* SQL update

* file rename

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-30 10:53:19 +00:00
Rowan Lea
9f26a62b30 Adds job overalls to the loadout menu (#27427)
* Adds janitor's overalls to the loadout menu

* Adds ALL the overalls

* Update code/modules/client/preference/loadout/loadout_uniform.dm

Yay formatting

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Rowan Lea <5251535+Screampuff@users.noreply.github.com>

---------

Signed-off-by: Rowan Lea <5251535+Screampuff@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-11-29 14:32:10 +00:00
AffectedArc07
5e5c75bf48 Adds toggles3 (#27397) 2024-11-24 14:23:27 +00:00
Qwertytoforty
da630e1b63 Impliments a new voting system for weekends and wednesday: Hybrid FPTP weighted random from preferences (#26879)
* temporary wip

* the rest of the fucking owl

* Replaces Nodupes with FPTP, and wensday

* ok you are still a little stupid

* c-c-c-changes

* Create 60-61.sql

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* woe up to date apon thee

* make that up to date

* contras changes!

* thanks contra!

* Update code/__DEFINES/misc_defines.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* last thing

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-11-14 17:57:58 +00:00
warriorstar-orion
bfb18b48e4 dmdoc: Some cleanups. (#27242)
* dmdoc: Some cleanups.

* satisfy check_grep
2024-11-13 13:37:37 +00:00
Chap
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-13 13:02:29 +00:00
Ordosian
cd2cdd33f4 Plasmamen drip - Tacticool Suit (#27092)
* Plasmaman Tactical Suits

Drip needed

* Clarification for dummies

* Radial Menu

* Removed the unneeded helmets.

* Desc Fix.

* Documentation and Static

* Unnecessary Check

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Documentation Fix

* Alt-Click better

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Better

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Initial for diver

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Contrabang requested changes.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Requested Changes

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

* Update code/modules/clothing/spacesuits/plasmamen.dm

Requested Changes - Hands Blocked trait

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>

---------

Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-11 13:04:17 +00:00
Aylong
ca50656a51 [TGUI] Loadout (#27026)
* [TGUI] Loadout

* Loadout Tweaks

* Cleanup

* Almost there

* Allow to sort alphabetical

* UX tweaks

* Note and remove tweaks from scarf

* Oh fuck

* Ooops

* Sorting features

* Global search

* Rebuild

* Sure

* Rebuildo and some review changes

* TGUI REBUILDO!

---------

Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-09 08:04:53 +00:00
Spaghetti-bit
afd52f006a TGUI Color Picker (#26326)
* Init

* Implements `tgui_input_color`

* Implements most color wheel conversions to TGUI

* Iteration two, went over titles and made sure most color inputs are functional.

* Implements preferences for large buttons, swapped buttons, and disabled TGUI

* Iteration three... the weird ones. (as null|color)

* Removes `as color|null` and `as null|color`

* Merge conflict resolution, again.

* Color input bundle and panel bundle

* CSLint being picky.

* Picky `while ()` instead of `while()`

* Apply suggestions from code review

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* WIP

* de-bri'ish colour into color

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Aylong review applied.
- Removed an extra space in machine.dm
- UI_STATE

+ Runechat color now uses TGUI_INPUT_COLOR

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Removes an unintentional space to `paradise.scss`

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Adds "is_color" regex from TG

* Fixes a few conflicting files

* TGUI Merge conflict moment v3

* V4?

* V5....

* God please don't explode. Builds TGUI like the linter wants.

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Rebuilds TGUI, again <3

* Lint be damned

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-07 21:24:45 +00:00
Bm0n
ade220d0cb Ports Jumpskirts! (#26935)
* wip test 1

* sprites

* code added

* vendors and locker spawns set

* added to prisoner locker

* accidental deletion

* sprite fix

* Update code/modules/clothing/under/color.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* new kidan sprites

* Update code/modules/clothing/under/color.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/under/color.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-10-22 09:22:00 +00:00
warriorstar-orion
5f814597a7 lint: forbid whitespace in empty list decls (#26972)
* lint: forbid whitespace in empty list decls

* Update tools/ci/check_grep2.py

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* close enough to grab a bunch

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-10-21 19:28:21 +00:00
Bm0n
1b25a5b021 Surgery sounds 2: Now with volume mixer! (#26884)
* fuck it

* these too

* ooops

* i did it again

* moved some vars around

* updates generics

* rematch

* oh shit i think this needs a break

* agh

* wall

* updates comment

* compile after 2 years

* this might break things

* typo fix

* restores surgery sound to default

* Misplaced thingy

* support for some new ghetto surgery changes

* organ2

* Update code/modules/surgery/bones.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/surgery/surgery.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review change

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-10-06 09:40:33 +00:00
Contrabang
413ddc8b73 Adds Floor Lights (and makes lights not have random ranges) (#26923)
* Adds Floor Lights

* undef

* remove TECHNICAL DEBT™

* remove more technical debt™

* mapping changes
2024-10-06 09:33:31 +00:00
Erikos66
b991c4bf8d preferences perms update (#26677)
Signed-off-by: Erikos66 <155964994+Erikos66@users.noreply.github.com>
2024-09-25 02:36:04 +00:00
Adrer
2f9182b6a6 [RUNTIME] Fixes trying to open the head marking menu for certain IPC heads. (#26701)
* You can no longer attempt to open the head markings menu for certain IPC heads with no possible markings.

* Added a TGUI alert

* Update code/modules/client/preference/link_processing.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-09-16 14:54:50 +00:00
Sean
98912fcea9 More 516 fixes and TGUI improvements (#26617)
* more 516 fixes and tweaks

* cleaned build output

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-16 14:37:09 +00:00
ElorgRHG
e2a7c805dd Paradise's soul removal part 7: engineering jumpsuits and accessories (#26641)
* Engineering jumpsuit resprite/refresh

* Engineering berets resprite/refresh

* CE mantle resprite

* Grey CE pants consistency fix
2024-09-14 07:01:30 +00:00
dearmochi
512ec5c9dc Re-add removed toggle for prayer sounds (#26739) 2024-09-12 16:55:54 +00:00
Paul
a00a036841 add option to disable end of round sound (#26014)
* add option to disable end of round sound

* fix sleep position

* add EOR sound to enable/disable preferences

* invert logic so that existing players don't mute the sound

* fix inconsistent mute/hear variable

---------

Co-authored-by: pwbokie <pmerkamp@butler.edu>
2024-09-10 22:50:40 +00:00
Daniel Lenrd
de1250ab42 Adds and Adjusts Loadout Items (#26441)
* Give Paramedic a medical beret

* Change path of Wardens' beret

* Give HOS and Warden loadout berets

* removes Barber from Service Armbands

* Gives Captain Procedure Armband

They are technically a Head of Procedure

* Gives Explorer Cargo Armband

* Gives Geneticist Research and Medical berets

* Gives Geneticist Research and Medical armbands

* Gives Virologist Medical armband

* Gives Detective Security beret

* Gives Shaft Miner Cargo beret

* Gives Explorer Cargo beret

* Gives Geneticist Research and Medical winter coats

* Gives CMO EMT armband

they can have EMT labcoat, they are trained professional, why not?

* Gives Geneticist Research and Medical bomber jackets
2024-09-03 13:02:33 +00:00
AffectedArc07
b962a243c3 Balls (#26652) 2024-08-30 21:31:34 +00:00
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Spaghetti-bit
52327cea40 [TWEAK] Runechat Color Preference and Species Dependent Organ (runechat) Removal (#26018)
* Reopens runechat color tweak.

Fully changes how the runechat color works with human mobs.

- Ties Runechat color to DNA (unchangable via scramblers, or other methods like DNA modifying)
- Runechat color is now a preference based thing and can be changed at mirrors.

* Linter mint

* Comment for comment's sake + Rerun cerestation CI/UNIT test because mouse ate a cable.

* augh

* reverts toml

* Fixes a SQL query, good for final review.

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-08-06 13:15:47 +00:00
DGamerL
b497e4c925 Removes a lot of redefined procs (#26186)
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-30 13:19:32 +00:00
S34N
122ede44a9 Fixes client href issue (#26331) 2024-07-29 15:48:07 +00:00
Blossom
1da9959952 Fixed the description in the settings for the disco machine music toggle being a copy of the music instrument description (#26283) 2024-07-25 15:09:59 +00:00
Spaghetti-bit
3299640dce Prevents a rate limit when alt clicking or receiving a ping from the server. (#26127) 2024-07-22 07:44:07 +00:00
Luc
cb4d709c78 Fixes some extraneous spacing in some messages (#26222)
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-07-20 00:15:21 +00:00