Commit Graph

7209 Commits

Author SHA1 Message Date
Qwertytoforty
2fa2576571 converts traitordevices.dm to activate_self (#27529) 2024-12-19 19:10:11 +00:00
Hayden Redacted
ed626bfadb Ports Different Variants of Nian Plushies and Introduces a Plush Spawner (#27450)
* ports over more nian plushies from shiptest/beestation and introduces plushies into maint loot

* remove a value

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* removed a value

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* removed a value

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* remove a value

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random/plushie_spawners.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random/plushie_spawners.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* this should fix the conflict

* please let this upload fix the conflict

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* i need to stop pressing commit as a form of saving, my apologies.

* added the dmi back

* fixing indentation

* removes a comment.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* bumps the weight of tools and materials up to 4

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-12-18 15:32:27 +00:00
warriorstar-orion
bd6450d884 Cleanup ITEM_INTERACT_ flags. (#27640)
* Cleanup `ITEM_INTERACT_` flags.

* replace new uses of old flags
2024-12-17 21:54:28 +00:00
warriorstar-orion
02a37c8303 Fix wallets not ingesting cards on click. (#27655) 2024-12-16 03:19:46 +00:00
Qwertytoforty
0caf77d272 Attack Chain Migration: /obj/item/card (#27556)
* the work so far

* She returns on my TRUE till I ITEM_INTERACT_SUCCESS

* do this too (rip good commit name)

* Did you know? You can stamp ID cards!
2024-12-15 21:06:48 +00:00
Contrabang
0e765746b6 Adds a new TGUI Admin Antag Menu (#27545)
* Adds a new TGUI Admin Antag Menu

* Prettier

* fuck

* oops

* swap this shiiit

* Rebuild

* changes

* hate contractors, simple as

* welp forgot this

* fix

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-12-15 01:39:12 +00:00
1080pCat
3c8b9492f8 his grace attack chain migration (#27580) 2024-12-11 16:19:04 +00:00
CRUNCH
c6fcd16078 Buffs Brass - Adds a Selection of New Brass Furnishings (#27465)
* creation

* Update clockwork-overlays.dmi

* Update computer.dmi

* Update computer.dmi

* Update Operating.dm

* airlock

* Update airlock_types.dm

* Update code/game/machinery/Sleeper.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-10 16:04:47 +00:00
Toastical
aa140c1184 Tweak: Magma-ale and space beer are now a bottle subtype (#27407)
* makes magma-ale and space beer bottles instead of cans
replaced all occurences of the cans to the new type

* forgot to rever test_tiny

* path script + repathing

* space bar sleepy beer repath

* Update tools/UpdatePaths/Scripts/27407_ale_beer_repath.txt

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Toastical <vnndvp@gmail.com>

* Update code/game/objects/structures/crates_lockers/closets/secure/bar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Toastical <vnndvp@gmail.com>

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2024-12-07 22:18:55 +00:00
warriorstar-orion
d23c808e47 Fixes several attack chain call sites (#27553) 2024-12-06 22:20:12 +00:00
ExusA
584e6b26d5 Adds the RSF Executive Service Upgrade for cyborgs (#27371)
* Adds the Executive RSF cyborg upgrade.

First commit for the Executive RSF with basic functionality.

* Add cheese knife

Adds a cheese knife along with the RSF upgrade to cut the cheese.

* Executive RSF Upgrade functionality.

Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.

* Nerf cyborg cheeses

Nerfs cyborg cheeses to be worse than chef food.

* Resprites Smoked Cheese

* Fixes power cost calculation

* Cleanup

* Standardize tech and Materials cost

* Adds caviar trash

Adds an empty caviar can.

* Edam and flavor

Add Edam

Adjusts flavors to compete with cheese reagent

* Undo sprinkled donut

Undid changes to RSF donut

* Fix RSF icon missed pixel

* Boolean fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* Resprites basic cheese

Resprites basic cheese at the request of @DGamerL

* Update new cheese sprite

Adds wax to the new cheese.

* Delete unused cheese icon

Deletes a prototype cheese icon.

* Readds normal cigarettes to the executive RSF

Adds normal cigarettes back to the RSF at Fordoxia's request.

* Turns caviar from red to black

Rebrands caviar into the fancier, black variety

* Deconflict

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-12-06 14:03:58 +00:00
AffectedArc07
d663dfc3fb [READY FOR TM] R&D Rework Part 2 - Death to the experimentor (#27472)
* PT1 - Death to experimentor

* I cant fail CI this fast come on

* PT2 - DA -> SA

* CRLF to LF

* Strange icons in the SA now

* Lets give this a go

* AGH

* Dirt

* WORK

* Oops - cere was missing the RD locker

* Map fixes

* Adds delivery chute back

* Warrior review

* Also removes magnetics

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-04 17:55:39 +00:00
Chap
a0c326c939 [FIX] Slimepeople can pick a bloodtype on agent IDs again (#27509)
* Fixes bloodtype picking for agent ID

* Oops

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-12-03 10:59:04 +00:00
1080pCat
04f773a62a People activating a powersink now pokes ghosts with a follow prompt (#27349)
* People activating a powersink now pokes ghosts with a follow prompt

* fixes 'a the powersink`

* slight title change

* changed title again, added another prompt when its about to blos

* Update powersink.dm
2024-12-03 10:50:40 +00:00
warriorstar-orion
525c68d617 Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834)
* refactor: Attack chain, initial setup.

* migrate curtain to make dreamchecker happy

* update thurible

* don't call attacked_by separately for legacy attack chain

* remove duplicate proc

* condense similar code, put allowances for legacy code in new procs

* update docs, include diagram source

* add comment on how to update diagram

* fix admonition

* mindflayer updates

* remove commented out code

* clarify all steps

* after_attack should be overridable

* whoops

* retrofit recent changes

* duh, can't restrict this yet because of tool_acts

* i hate ore bags with the fire of a thousand suns

* return correct value for object attack logic

* Various cleanups.

We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.

I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.

* simplify some argument names

* fuck it

* make it do the thing

* Rename CI module call

* Prove that CI works

* improve test output

* aaand fix it again

* fix curtain tool interactions

* fix compile error

* fix compile error

* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
Contrabang
51a831288e Admin Jsons now have proper assignments and ranks (#27502) 2024-12-01 04:35:23 +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
Toastical
96b4f46560 cloaks fit in garment bags (#27491) 2024-11-30 12:04:37 +00:00
Contrabang
734d0166a0 Removes some non-existant typepaths (#27362)
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE

* Removes some non-existant typepaths

* yes
2024-11-30 12:04:03 +00:00
chuga-git
c21be0b102 excludes user from seeing storage insertion message (#27490) 2024-11-30 01:21:09 +00:00
Chap
f0ac13b80b [FEATURE] Decal painter (#27036)
* Add_Decal_Painter

* Seperate TGUI file

* Decal painter DmIcon

* Fix some merge errors

* I don't know why this merge is so incredibly fucked

* Update TGUI bundle

* I swear to god

* Fixes DmIcon

* TGUI bundle build

* Remove implicit var

* Final cleanup

* Add decal_painter sprite

* Update code/game/objects/items/devices/painter/decal_painter.dm

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

* Add helper proc for deleting all components of a type from a datum

* Added comments to cycle_style

* Elementized decal fixes

* Use the new decal system

* TGUI bundle

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-29 14:30:48 +00:00
Migratingcocofruit
3be13c3997 Fixes some dyed items retaining their original appearance and adds plasmamen helmet dyeing (#27256)
* Fixes dying not changing the color or description of the dyed item, making it appear unchanged when worn.

* adds plasmaman helmet dyeing
2024-11-29 10:52:09 +00:00
chuga-git
32b97afbec fixes some bad html (#27481) 2024-11-29 10:46:51 +00:00
DGamerL
392c8fbfad Nerfs the push broom (#27469) 2024-11-27 22:06:39 +00:00
Qwertytoforty
bc41214306 Updates the syndicate combat borg to a cool spider borg (#27332)
* Resprites the nukie cyborg

* whatever fuck you rust g

* god I hate rust g

* suffering

* I forgot to save auugh

* fixed

* please stop silently modifying surgeon

* woe more sprites apon thee
2024-11-27 17:12:16 +00:00
Bm0n
6eb1269d8e Return of the neck slot! (#27188)
* this turned out to be wayyyy more than just a test

* remove bedsheet icons from back.dmi

* hud+better icons

* error fixed

* fixes a few bedsheet icons

* Update code/game/objects/items/weapons/storage/garment.dm

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

* review

* spacing

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* lint?

* guh

* lint

* TGUI Bundle Rebuild

* test

* fix

* dead golem fix

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-27 17:04:53 +00:00
Contrabang
396215501c Machine Frames are now structures and not machines (WTF???) (#27388)
* yes

* yes 2

* consistency

* yes

* rename update paths
2024-11-27 16:51:46 +00:00
Drsmail
5656f3409a [FEATURE] New chameleon pen for forging [signs] (#27128)
* Added a new item - Chameleon pen for Forging signatures and also made a new kit with it and chameleon stamp

* Fixed shorted nemes and replaced spaces with tabs (I hope)

* Last space fixed

* Apply suggestions from code review

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

* Chameleon pen now have same discription as a regular pen, also retested evrething again.

* Apply suggestions from code review and the one i missed by mistake

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

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/datums/uplink_items/uplink_general.dm

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

* changed the cost. Added proper logs. Adjacency checks

* removed duplicated code

* Applied suggested changes from code review

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-27 05:16:52 +00:00
PopeDaveThe3th
09830b2ce8 Language Changes & Lore Pt. 1 (#27257)
* stage 1

* Fix bundle (TGUI was not rebuilt)

* mr worldwide

* LT galcom suggestion

* period

* bundle

* Update code/modules/mob/language.dm

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-11-25 11:25:38 +00:00
SchrodingersWolf
053470ef90 SS13 isn't that sort of fantasy game (#27364) 2024-11-24 22:38:48 +00:00
Contrabang
aa2651f659 Unfucks Bulldog Bundles (#27376) 2024-11-24 20:04:40 +00:00
Qwertytoforty
c50ff7ce9c Adds a new spellblade enchantment: Temporal. Also adds lightning knockdown back. (#27314)
* cutting edge

* remove the message admins lmao

* eh name should just be temporal

* undef

* Apply suggestions from code review

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

* updates description, removes shock change as it happens on live now I guess

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-23 13:50:39 +00:00
Toastical
cb1e9df8be Adds plasmaman envirosuits to departments (#27255)
* Added envirosuits to departmental vendors

* added envirosuits to garment bags

* added mining envirosuit to mining wardrobe locker

* fixed genedrobe organization
2024-11-22 18:13:35 +00:00
CRUNCH
c9930f6975 [FIX] Makes Borg Stun Arm screwdriver_act() return FALSE. (#27414)
* Update stunbaton.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-22 13:10:40 +00:00
Toastical
2ec6a3adfc Lit welders will now set flammable people on fire (#27380) 2024-11-19 00:47:50 +00:00
Qwertytoforty
07dac1d537 Fixes grenades not exploding 15% of the time you are shot (#27368)
* Fixes grenades not exploding 15% of the time you are shot

* userdanger it
2024-11-18 23:52:30 +00:00
Chap
1a476eb501 [FEATURE/TGUI] TGUI agent ID (#26937)
* initial commit

* tgui patch

* more fixes

* It's Assistant now, not Civilian

* review suggestions

* make it tsx

* update tgui bundle

* code quality

* fix choosing assistant

* convert idcard skins to asset

* use ranks + some quality updates

* TGUI agent ID (Russian edition)

* Fixed new_appearance

* Job_icons

* DME updated

* Changed icon ordering

* Updated comment

* Add crew_list

* Your to ID

* WE MUST PLEASE THE LINTER GODS. Also DMIcon instead of assets

* Fixed the HUD icon

* var instead of proc

* Move hud_icon declaration

* Apply suggestions from code review

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

* Move agent ID to seperate file

* Job_icon first

* Requested changes

* A little more sanitization

* Update tgui/packages/tgui/interfaces/AgentCard.tsx

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

* Update tgui/packages/tgui/interfaces/AgentCard.tsx

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

* Bundle update

* WE MUST PLEASE THE LINTER

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: larentoun <larentoun@gmail.com>
Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2024-11-17 22:25:02 +00:00
Contrabang
8352613d03 Adds CI for missing icon_states (#27063)
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE
2024-11-14 17:58:06 +00:00
larentoun
a08dd177ba Baseball resets deflectmode on dropping (#27229)
* reset deflectmode on item dropped

* louder message that you can't attack
2024-11-14 17:16:33 +00:00
Paul
bd7cbb1a54 Brass light fixtures (#27312)
* add brass lights

* start adding clockwork floor lights

* implement floor lights

* fix an error and add missing brass light sprites
2024-11-13 19:14:31 +00:00
warriorstar-orion
bfb18b48e4 dmdoc: Some cleanups. (#27242)
* dmdoc: Some cleanups.

* satisfy check_grep
2024-11-13 13:37:37 +00:00
Chap
513a60ba69 Nerf bible healing (#27100)
Co-authored-by: Adrer <adrermail@gmail.com>
2024-11-13 13:09:01 +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
Qwertytoforty
c297dde150 [s] Stealth box fix (#27351)
* stealth box fix

* isturf moment
2024-11-13 02:28:11 +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
Henri215
bb570af98f cardboard cutouts (#27194) 2024-11-11 12:55:47 +00:00
Henri215
b38c4bbd4c A few description grammar fixes (#27134)
* Double spaces

* more space and misspelling

* Fixing punctuations

* Not now

* double dots

* Apply suggestions from code review

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

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-10 13:38:28 +00:00
kyunkyunkyun
0c770b558c Getting rid of generic first aid kits in mapping (#26947)
* get them all

* uhh

* suggestions apply + CI

* medbot faid fixed + script
2024-11-09 22:20:44 +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
1080pCat
239ea855d2 Death alarms have a SLIGHT cooldown on when they send another message (#27287)
* Update bio_chip_death_alarm.dm

* contra review
2024-11-07 18:42:20 +00:00