cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-18 03:43:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,335 Commits 15 Branches 2 Tags
2ec6a3adfcdc092cbee5cafbcd8b712e0822fa45
Commit Graph

27865 Commits

Author SHA1 Message Date
Bm0n a44c3cda42 Fixes HIDEJUMPSUIT and HIDEGLOVES invis flags Edit: Now with HIDEEARS!!! (#27232) 
* fix

* HIDEEYES

---------

Co-authored-by: Bmon <no@email.com>
 2024-11-18 23:54:51 +00:00
Bm0n ea7295bc9b Fully adpots previously ported bottle sprite and fixes reagent overlays (#26962) 
* test 1

* Bottles

* quick fix

* brighter reagent bottle

* removes old lids

* Update code/modules/reagents/reagent_containers/chemical_bottle.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-11-18 23:53:17 +00:00
Bm0n 98b48c5ca2 fix (#27350) 
Co-authored-by: Bmon <no@email.com>
 2024-11-18 23:52:23 +00:00
PopeDaveThe3th b3c1890462 [LORE] Extensive Modsuit Lore Drop (#27119) 
* modsoup

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* ogre

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* yep

* suits

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* changes

* taka

* Update code/modules/mod/mod_theme.dm

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

* crunch changes

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* single letter typo

* somniworld suggestions

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Git-GoR <58085266+Git-GoR@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-11-18 20:49:38 +00:00
Chap 6f5441fe08 [s] [FIX] Exploit fix (#27387) 
* That's illegal

* Requested changes

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-11-18 16:11:35 +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
Toastical 0d266f6247 Multitool cable pulse message is now outputs in regular chat rather than the combat log (#27372) 
* cable multitool pulse will no longer spit out results in the combat log

* made the cable pulse msg prettier

* Update code/modules/power/cables/cable.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

* made the text red

* made the successful message blue again

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-17 11:19:39 +00:00
Сиротка c721210f45 [CLEAN] Remove 2 outdated lines from crusher code (#27182) 2024-11-16 06:29:28 +00:00
Contrabang 975d9ed8e3 Fixes a bunch of runtimes (#27363) 
* hjnbujihbhuji

* uioybgyub

* Fixes a bunch of crunchy runtimes
 2024-11-15 11:22:09 +00:00
Burzah bff89a13f0 Revert "Singulo engine buff (#26929)" (#27360) 
This reverts commit 627fe1e059.
 2024-11-14 20:11:53 +00:00
PollardTheDragon f49b312661 New Space Ruin: Drakehound Skiff Wreck (#27056) 
* Skiff

* Unathi_Breacher_Ruin

* Fixes illegal file warning

* Uses damage landmarks instead of burnt plating tiles

* Wall changes, decals, space ruin datum

* Rotated consoles, added small shelf of breaching tools

* Config change for map

* Undoes minor config change

* Removes deathsound
 2024-11-14 17:58:08 +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
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
Migratingcocofruit 627fe1e059 Singulo engine buff (#26929) 
* iteration 1

* oops

* Okay now it actually works

* remove rad cap

* Adds a singulo monitor

* comments and other fixes

* rebuild tgui

* updates last size now. breach alerts now go before warnings

* oops

* fix console lables for the field gens

* New generator lookup algorithm

* comment added

* sort out the return and checks on temp_gens

* Adds sprites to the singulo monitor

* fix sprite stuff and singulo alert

* rebuild tgui

* Adds a singulo monitor board to RnD.  Uses the correct icon when no singulo is being monitored.

* give commas some space

* Adds a singulo console board to the singulo engine crate

* style fixes and fixes the check for singularity location and type

* Rebuild Tgui

* style fixes and a comment

* Removes redundant brackets

* Correct the check for there being containing generators

* Changes the generator_field variable to a more generic name

* adds a period to a comment

* Restore accidentally modified icons to their original state

* Rebuild TGUI

* Rebuild tgui

* rebuild tgui

* Rebuild TGUI

* rebuild tgui

* TGUI rebuild

* Style fixes

* TGUI rebuild

* rebuild tgui

* rebuild tgui

* Let's see if this works

* I didn't see that merge conflict. Rebuilding again

* rebuild tgui

* Rebuild TGUI

* Review changes

* Changes to the new variable name in the singulo monitor

* Adjusts bar values for each colour according to the reduced energy capacity of the new generators

* Rebuild TGUI

* Review changes

* missed a line
 2024-11-14 16:48:38 +00:00
Qwertytoforty 96c88a6122 better pistol sprite by Salted-Zen (#27290) 2024-11-14 09:36:44 +00:00
ExusA 5cd987f464 Adds a new Janitorial "Rover" cyborg skin (#27310) 
* Janitor Rover

Adds the janitorial version of the Rover cyborg skin.

* Typo Fix

Jani rover formatting fix

* No-Hat

Currently the code doesn't support different hat offsets for directionals.

* Pink-to-Purple

Changed to a purpler color to better match other janitorial items.

* Deconflict

* Deconflict Again
 2024-11-14 09:28:13 +00:00
Hazel 6b0d40542c Updates sprite and description (#27320) 2024-11-13 19:14:34 +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
ExusA 4f2c406b00 Adds a new cyborg skin, "Rover" (#27243) 
* Rover Cyborg

Adding a new cyborg skin, 'rover'.

* No-Hat

The hat won't fit on its head without changes to how hat wearing works.

* Rename to Rover-Engi

To make way for other department module names.
 2024-11-13 19:14:02 +00:00
Mitchs98 0780f53555 fix (#27301) 2024-11-13 18:13:29 +00:00
warriorstar-orion bfb18b48e4 dmdoc: Some cleanups. (#27242) 
* dmdoc: Some cleanups.

* satisfy check_grep
 2024-11-13 13:37:37 +00:00
CRUNCH f6a45ae95e Fixes Autoinjectors and Some Hyposprays Working on Robotic/Missing Limbs, Minor Refactor of can_inject() and Related Variables (#27118) 
* Creation

* refinement

* Update hypospray.dm

* Update human_mob.dm

* update

* Update hypospray.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-11-13 13:35:47 +00:00
Migratingcocofruit 0218b541f2 Energy field generators Refactor/Tweak (#26919) 
* Reduces range for energy seeking of generators, adds energy spreading and changes instances of power to energy. Containment field destructor no longer crashes when it has no connected generators

* review changes

* undef

* removes redundant line

* review changes
 2024-11-13 13:23:41 +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
DGamerL 38100d9e52 Removes the last nucleation stuff (#27241) 2024-11-12 00:15:54 +00:00
HMBGERDO e4af6ca0a9 thermite no more makes walls with 5u max reagents (#27330) 2024-11-11 15:15:05 +00:00
Bm0n c4bde0d97a Resting offset fix 2 (#27316) 
* fix

* revert

---------

Co-authored-by: Bmon <no@email.com>
 2024-11-11 15:14:29 +00:00
Chap 6aca80153b [FIX] Kitchen machines no longer accept reagents while running (#27288) 
* Cannot add reagents to an machine that is on

* Check if target is refillable, not if it's drainable

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-11-11 15:14:00 +00:00
DGamerL 192692f06a Makes carp not hostile to asteroid mobs (#27313) 2024-11-11 15:12:22 +00:00
Chap 1db9e86083 [FIX] Goliath no longer seems to come to live from mining grenades (#27309) 
* Goliath no longer pretends to be alive

* Update code/modules/mod/modules/modules_supply.dm

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

---------

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-11 15:09:51 +00:00
Aylong 516ada30e6 Fix Appearance Changer runechat color change (#27340) 2024-11-11 15:07:15 +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
Chap 5d82d0c0de You can no longer see all pipes while in a cryocell (#27331) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-11-11 12:52:16 +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
Chap 4c9555a625 [TGUI] Chameleon item TGUI (#26971) 
* TGUI Chameleon

* TGUI cham shoes

* Searchbar and outfit

* Adds selected to data

* Remove unused spritesheet

* Remove unused file

* New bundle

* Field access type

* One more time

* Please leave me alone linter

* Re-adds some improper tags

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-11-10 13:18:57 +00:00
warriorstar-orion 017a56f808 blackbox: mark biohazard events affected by admin spawns (#27196) 2024-11-10 04:35:44 +00:00
Contrabang aec6b15967 yes (#27329) 2024-11-09 23:32:33 +00:00
Contrabang 9b2cd0abea Adds Bitfields to the VV menu (#27266) 
* Adds Bitfields to the VV menu

* oops

* fixed

* oops

* woo

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-11-09 22:49:51 +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
Chap 5355108858 Fix admins not being able to send faxes (#27285) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-11-09 22:05:35 +00:00
DGamerL 3eeb7ce0ac Makes being jobbanned more clear to player who somehow still get made into an antag (#27046) 
* Makes being jobbanned more clear to player who somehow still get made into an antag

* Apply suggestions from code review

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

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
 2024-11-09 21:46:11 +00:00
WenlockTheBritishHobo d67c8b4b11 Adds Mimestrogen! (#27028) 
* Mimestrogen start

* Removes some clown bits from Mimestrogen

* Forgot to use M instead of C when copying a line

* Fixes the emote.

Hadn't realised it calls an emote instead doing a custom one.

* Uses mind.miming instead of the mute trait

* Makes the screen greyscale, some comments in the code

* Fixed perma greyscale

* Changed a mime_message.

* Removes an unneeded variable

The variable was already commented out anyway.

* Forgot something in a comment

* Fixed the description and added a drink description

* Recipes for Mimestrogen

* Stops Vox from taking damage that's for IPC

* Moved a comment one space

* Wrong variable for the pasted check

* Remove proposed recipe 1, add a comment space

* Change check method for damage dealing

Instead of relying on syntheticness, it's better to check if the individual is affected by Toxin damage or not.

Also removes some unneeded comments.

* Just so I don't have to deal with a conflict.

* Make the tox_mod check work better

Makes it so people can't heal from a negative tox mod.

* Accidentally had a line to remove

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* makes mind.miming switch make more sense

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

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

* Applying suggestion from code review

I don't know why there needs to be a line between client.color and update_client_colour so I've just done an if else with the trait removal in both.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

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

* funny -> entertaining

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

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

* Better formatting in message list

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

---------

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-11-09 21:25:31 +00:00
AffectedArc07 dc6a068bc8 OHHHHHHHHHHHHH GOD (#27327) 2024-11-09 20:38:37 +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
Billcyferka 9329140099 fixes small mistake in card reveal text (#27311) 2024-11-09 05:18:16 +00:00
Aylong ebbf48b764 Fix chef hat inhands sprite (#27323) 2024-11-08 23:06:27 +00:00
CRUNCH c9494ea955 Polishes the USSP Teleporter Ruin (#27195) 
* creation

* Update ussp_tele.dmm

* Update code/modules/paperwork/paper.dm

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

* reformat

* config

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2024-11-08 10:24:53 +00:00
CRUNCH 351ce517fa Polishes the USSP Listening Post (#27175) 
* creation

* Update dj.dmm

* Update dj.dmm

* Update dj.dmm

* NO FAKES HERE! It's ALL real!

* Update dj.dmm

* update

* Update space_areas.dm

* Update space_areas.dm

* Update space_areas.dm

* grille removal

* Notes

* update
 2024-11-08 10:24:48 +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