Commit Graph

720 Commits

Author SHA1 Message Date
iramoye
c3b4828121 Initial commit (#31355) 2026-01-04 10:54:42 +00:00
Alan
8f87fa0b98 Add juice boxes. (#31331)
* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.

* Appease linters with static typing?

* Add juice box box. It's a variety pack.

* Add trailing commas to positive quirks as requested.

* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.

* Add juice box variety pack supply crate.

* Make juice box storage even fancier.

* Thanks, linters!

* Thanks, linters! part 2

* Give the pre-packaged juice boxes a brand name.

* Apply whitespace suggestion from review.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-30 05:32:56 +00:00
Alan
d37f014ecc Adds SolGov winter coat. (#31335)
* done

* oops

* vox fingers

* Update misc_suits.dm

* update icon vars in line with new sprite code

* Update SolGov winter coat to match others.

* Add SolGov winter coat object sprites.

---------

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
2025-12-27 09:43:31 +00:00
Toastical
16d0b18953 fix round-end credits using the wrong toggles var (#31327) 2025-12-20 17:44:10 +00:00
Christer2222
e2efb09016 Adds a display for job difficulty as well as a description of the job (#30960)
* tip window, comments, padding, difficulty supervisor

* spacing

* shows missing stars

* dmi to base64

* defines

* assigned difficulty to each job

* added star sprites

* assistant fix

* show stars when assistant

* Fixed restrictions

* comment

* consistent size work preference

* tooltips now work, indented html

* inlined the tooltip script

* Moved buttons to top

* padding and margins

* align learn more button right

* css cleanup

* added descriptions. HTML encoding.

* cargo description expansion

* linting

* null check

* l

* 3 half stars

* lint

* miner difficulty 3->4

* spacing and removed old test comments

* spacing pt1

* spacing pt2

* string names of colors

* spacing

* rearranged defines

* span -> defines

* snake_case

* removed extra space

* Apply suggestions from code review

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

* Update code/modules/client/preference/character.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>
2025-12-18 23:09:07 +00:00
kyunkyunkyun
b0463d3c83 Convert most spans to defines (#31080)
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
2025-12-13 23:55:48 +00:00
Ahzpy
bc64756eec Bandana Reshade + Color Edits (#31095)
* bandana resprite, color, loadout

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* Update code/modules/clothing/masks/misc_masks.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* so you can batch suggestions

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-12-12 15:26:15 +00:00
Ahzpy
f36344740c Adds Blind Cane (#31136)
* blind cane

* fix equal sign spacing

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

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-04 15:59:23 +00:00
PollardTheDragon
17f8f0d5a0 Ports End of Round Credits (#30778)
* Proof of Concept

* Dead counter

* Finishing touches

* Lints

* Lint

* Hides sneaky admins

* I promise to englishes gooders

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

* Addresses code reviews

* No more lazy list

* Addresses code review

* Length

* Apply suggestions from code review

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

* Global List

* Address code review

* Apply suggestions from code review

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-12-03 15:30:20 +00:00
Toastical
5ec6bc6eac adds dark flash toggle (#30945)
* add dark flash toggle

* check for client

* remove string shenanigans, makes the dark flash path a var

* rename type argument to something that doesn't belong in an asylum
2025-11-30 09:41:31 +00:00
Seren Highwater.
dc88571fce Adds cargo pants to clothing vendor and loadout. (#31017)
* done

* done2

* fix config oopsies

* greynvoxfix
2025-11-23 06:27:58 +00:00
chuga-git
4e86b993c9 unfuck my branch (#30925) 2025-11-23 02:57:29 +00:00
Ahzpy
846c5de47e [PTBF BACKEND] - Paratoberfest 2025 Rewards (#30840)
* code n sprites

* fix spacing inconsistency

* missed a spot!

* Update loadout_neck.dm
2025-11-19 12:36:20 +00:00
Ahzpy
0a615e798e Bridge Gone; Science Department Resprite + Drip Expansion (#30917)
* obj sprites, human suits, vox suits, berets, softcap, loadout, vendors

* compile fix

* kidan sprites

* drask sprites + kidan uniform i missed

* xenobio merge conflict + swap robotics beret names

* grey sprites

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
2025-11-13 23:37:20 +00:00
Chap
0f2f6cdc3c Set pacifism to blacklisted for sec/com jobs. (#30995)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2025-11-13 23:08:30 +00:00
Runko
d7dd053258 Adds the "breathing tube" implant to the quirk menu (#30900) 2025-11-11 10:32:43 +00:00
funglios8s
8c234a00f0 Gives Xenobio access to science clothing in the loadout (#30961)
* gives xenobiologists access to science clothing

* Apply suggestions from code review

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

* Update code/modules/client/preference/loadout/loadout_uniform.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>
2025-11-11 10:25:38 +00:00
Vi3trice
14dbcfa941 This is a real sandwich (#30907) 2025-11-07 10:43:25 +00:00
Gatchapod
3bfc290063 New Tajaran veil HUDs (#30776)
* tajblind

* Trayson icons fix

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2025-11-06 07:21:48 +00:00
Alan
47300bb0d0 Expand chef ensemble possibilities (#30826)
* Add many chef clothes to game, chefdrobe, and loadout.

* Add another chef envirosuit.
2025-11-05 10:22:00 +00:00
BiancaWilkson
d558a69583 Ports a character customization option: Quirks (#28388)
* Makes the datum

* Initial Commit

* Gets TGUI menu not crashing

* Autodoc

* quirk menu bugged

* oh.

* Working menu + buttons

* trait defintes pt 1/?

* Moves traits around

* ACTUALLY START ON THE QUIRKS THEMSELVES

* TGUI Bundle Rebuild

* TGUI properly saves now

* Removes allergies for scope reasons, make foreigner work properly

* TGUI tweaks

* Reworks TGUI Menu

* quirks store the mob, not mind

* Adds asthma and mute

* minor tweaks

* Cloning re-adds quirks

* Adds functionality to frail

* Adds crafty

* TGUI fix

* Fixes a frail bug

* Makes sure the list is in the correct format

* TGUI size change

* Makes skittish work

* Adds glutton, removes unused traits

* Changes description and adds function to glutton

* Freerunner functioning

* Crafty buff

* Clear quirk list when changing species

* Forgot to remove light step

* Delete

* Refactor item-giving

* TGUI Bundle Rebuild

* whoops

* Apply quirks when changing species

* Removes some unneeded defines/paths

* Replaces improved charging cord with a bad charger

* coment

* Guard clause

* Changes how quirks add and remove organs

* unused var

* adding organs works, removing them doesn't yet

* oh that fixed it

* Hopefully finally once and for all fix the json issues

* Buffs asthma

* switches the processor to ssobj since it's slower

* actually spawns the items whoops

* maybe actually fixes json issues I really hope this doesn't come up again?

* moves sql to the right directory

* CULPRIT FOUND, JSON ISSUES ACTUALLY SOLVED

* adds admin tooling for quirks

* Ups the cost of lungs

* Adds removal for the drinking ones

* Fixes some duplicate code

* Removing foreigner works

* wops

* bumps sql version to 65

* prettier

* semicolon

* Foreigners can understand galcomm but not speak it, as per headmin request

* Different solution was agreed upon

* CC announcements now get auto-translated

* Apply suggestions from code review

Lewc quick suggestions

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

* Move alcohol tolerance basetype

* accomodates for reset_styles

* Swap to species flags, and being dead is a universal process stopper

* adds a foreigner trait

* Xenos and the like can't understand CC's translated announcements

* TGUI Bundle Rebuild

* Lewc quick fixes

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

* i forgor

* i forgor pt 2

* process properly returns true

* TGUI Bundle Rebuild

* sql update for fixing merge conflicts

* bundle changes

* actual sql fix

* Not test tiny in prod

* sql fix?

* tgui update, first pass

* Adds schema changes to main quirk branch

* persistent data works now

* TGUI Bundle Rebuild

* Fixes conflict with job assignment datumization

* TGUI Bundle Rebuild

* Adds pacifism by request, -3 points

* gives skittish a small cd

* Makes the lunch randomizer  I was thinking about doing

* GC returns a qdel hint now

* Removes hard refs

* SQL save fix

* Fixes admin tools

* Fixes wizards getting quirked up

* ragin too

* Lightweight is more lightweight

* Adds admin logging for when someone makes a languagesless character

* TGUI Bundle Rebuild

* Adds colorblind, hungry, and buffs asthma

* fixed vv post-merge conflict

* behold, my monster

* rebuild and merge master

* Adds more positive quirks, and makes monochrome give more points

* adds nearsighted, and no whispering

* sorry linter

* Adds the cool quirk, thanks to pumpkin312

* Oh dear that signal gets sent to everyone every time someone spawns in

* i forgot that slimes dont have eyes

* tgui fix

* bundle rebuild probably

* prettier

* prettier

* Skittish package fix

* force add bundle

* Makes plasmemes be unable to take foreigner

* Makes advanced lungs respect the owner's species

* makes breaking open wrapped crates/lockers a do_after_once

* Makes plasmeme/vox advanced lungs actually help

* You get glasses anyway whoops

* bundle rebuild

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-11-04 00:18:52 +00:00
Ahzpy
469412ed4f Botany Resprite: Section C, Accessories (#30714)
* sprites wip

* remove wintercoat

* Update config.toml

* remove wintercoat 2

* bandana sprites
2025-11-03 10:43:52 +00:00
AffectedArc07
9e36a2175d Fixes the dumbest of dumb SQL issues (#30833)
* Fixes the dumbest of dumb SQL issues

* Its always the bloody if styling
2025-10-30 21:35:53 +00:00
Anya
80df836d54 Adds the Shaft Miner and Smith overalls to the loadout menu (#30764)
* Add miner's overalls to loadout

Add miner's overalls to loadout options for parity with other jobs

Signed-off-by: Anya <5251535+Screampuff@users.noreply.github.com>

* Added Smith overalls to loadout

Added smith overalls to loadout

Signed-off-by: Anya <5251535+Screampuff@users.noreply.github.com>

* for fucks sake

no space allowed 

Signed-off-by: Anya <5251535+Screampuff@users.noreply.github.com>

---------

Signed-off-by: Anya <5251535+Screampuff@users.noreply.github.com>
2025-10-27 12:29:07 +00:00
warriorstar-orion
601ff5601e allow for undershirts to be ckey-enabled (#30795) 2025-10-26 22:17:32 +00:00
Ahzpy
4df0c8edb5 New Engineering Uniforms + Jumpsuit Recolor (#30735)
* human, vox, vendor, loadout

* kidan sprites, item sprites

* grey sprites

* drask sprites, remove temp palettes

* add softcap to vendors, linters fix?
2025-10-26 13:03:28 +00:00
PollardTheDragon
8ef20b664a Adds tajaran veil subtypes to loadout (#30578)
* Adds tajaran veil subtypes to loadout

* Apply suggestions from code review

Co-authored-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
2025-10-17 17:11:42 +00:00
Alan
a9c3b6d242 Update winter coats, add more, and tailor to species. (#30644)
* Update winter coats, add more, and tailor to species.

* Add white captain coat to loadout.
2025-10-15 11:05:58 +00:00
Alan
b2e0a08d0b Add a LOT of chaplain clothes from various religions. (#30483)
* Add a LOT of chaplain clothes from various religions.

* Thanks, linter!

* Deploy vendors, box envirosuits, unaccent names

* Thanks, linters!

* Accommodate ears.

* Correct accent oversight.

* Merge branch 'master' into chaplain-outfits

Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
2025-10-13 15:16:33 +00:00
kyunkyunkyun
9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453)
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
2025-10-06 17:59:46 +00:00
hyperholy
193f1a222f Fixes Preferences key binding problem Issue #29597 (#30554)
* Copied and fixed code from issue #29597

* fixed whitespace, make linter happy?

* okay LAST whitespace

* comments with hopefully enough information + whitespace fix
2025-10-04 17:24:17 +00:00
Paul
350f0e4d0d Add fake wizard outfit to loadout (#30489)
* add wizard outfit to loadout

* fix linter
2025-09-25 05:06:02 +00:00
kyunkyunkyun
8821ab9a66 Updates a couple of /obj/item variables (#29829)
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
2025-09-14 15:23:56 +00:00
Contrabang
e8f67c5e81 Makes Genetics fully a sci department (#30017)
* genetics -> sci

* Update code/game/jobs/job/science_jobs.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-09-09 18:20:39 +00:00
Alan
a9144d3ceb Update labcoat sprite references to their new locations. (#30018)
* Update labcoat sprite references to their new locations. Fixes #30001

* Small fix to robowhite labcoat path

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
2025-08-14 06:53:09 +00:00
Ahzpy
c1ce48e413 The Big Botany BResprite: Movement II, The Clothening (#29902)
* 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>
2025-08-13 22:30:07 +00:00
Seren Highwater.
207695cbda Adds Turtlenecks for Various Command Members. (#29948)
* 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>
2025-08-13 20:45:12 +00:00
Seren Highwater.
aa55e29bb9 bunny and cat ears (#29791) 2025-08-13 06:06:38 +00:00
kyunkyunkyun
f8c97bfed8 Bumps max client fps from 120 (125) to 1000 (#29467)
* 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
2025-08-07 20:07:23 +00:00
PopeDaveThe3th
1aca151144 Adds Clockwork UI theme (#29831)
* coggers

* feex

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
2025-08-06 05:11:38 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
Christasmurf
0332d0dbfd Paramedic Drip + some tweaks (#29766)
* code stuff

* icon stuff

* forgor the corgi

* absolutely beefed it

* old vest code removal

* wardrobe removal from maps

* frick and frock

* update path script
2025-07-26 05:57:31 +00:00
CRUNCH
175cfa60a1 The Smoking Expansion DLC (#29674)
* 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
2025-07-23 17:32:09 +00:00
PollardTheDragon
7fb2628288 Makes generic Bennyfallout's donor items and adds to loadout (#29671)
* Makes generic Bennyfallout's donor items and adds to loadout

* Sprite Fix
2025-07-09 14:29:25 +00:00
kyunkyunkyun
23a6483db0 Second package of skin tone fixes (#29489)
* further skin tone fixes

* a bit more
2025-06-17 16:49:49 +00:00
Kyani
fdcf4899a2 Frankenstein Station 13: Introducing dissections and alien organs to xenobiology (#29093)
* ddsadsa

ddsadsa

* moderate again

* revert

* beginning with rebase

* organssssssssss

* organs now process!

* analyzer finished! + mapping

* tool bit implementation and quality

* organs and fixes and reworks

* more organ work

* more organs done

* more organ progress!

* more organ work

* MORE. ORGANS.

* temp

* more organsssss

* ITS DONE!!!!!!!!

* oops

* also oops

* linter stuff

* forgot this + oops

* linter

* i forgot to save!

* lots of improvements and tweaks

* move icon over

* icon tweaks

* icon mistake

* oops

* dumb

* more icon validations

* i think thisll fix it?

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* fixes

* fixes+tweaks

* fix

* oops

* linter

* i didnt save....

* this should give -some- warning

* forgot a span

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* beginning edits

* more fixed and tweaks with cooldowns

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* lots of tweaks

* more review changes

* comment change

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* returns start back to gland

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* code review fixes

* trying to make surgery work....

* might as well push this

* perfection. now i need text

* text + small tweaks and bugfixing

* linting

* forgot to implement this

* deconflicting maps

* modifying for xenos again

* i guess this wasnt needed???

* added surgical belts to xeno

* minor swap

* quick fix

* small tweaks

* small tweak

* tiny tweak

* some slime updates

* more tweaks

* more updates

* first batch of fixes

* hiero audio fix

* robotic fauna fixes

* more rounds of bugfixes

* prevents teleporting

* tiny fix

* makes sharp more common

* misc fixes

* surgery and revenant fixes + extractor

* adds cursed organ logging

* small bananium organ tweak

* actually gives teleporter access

* adds a message to the analyzer

* can now drag naughts

* slime behavior tweaks

* headslug tweak, cant eat organs

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/game/gamemodes/miniantags/revenant/revenant.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* moved this

* major rework prep

* didnt save

* rework done

* small fix

* makes aliens draggable by crew after death

* shouldnt have cut this

* xeno organ tweak + tips

* oops

* fixes and tweaks to slimes

* not used

* temp revert

* rebase map files to master

* re-applying changes

* access fix

* access tweak

* big fix for new refactor

* more refactoring

* forgot a span

* Update code/datums/components/surgery_initiator.dm

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

* hiero only doesnt target dead megafauna

* various fixes

* fix requests

* fixed weird conflict markers

* deconflict

* deconflicting

* antimagic flags

* merge fixing

* Update code/modules/mining/lavaland/loot/hierophant_loot.dm

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

* regen mesh fix

* small fixes

* tick fix

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* grammar

* Update code/modules/surgery/organs/organ_internal.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/surgery/organs/organ_internal.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* tweaks

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-06-10 16:46:56 +00:00
Seren Highwater.
22636353c7 Adds tracksuits to the loadout. (#29510)
* track

* loadout
2025-06-07 13:55:57 +00:00
Christasmurf
0f387fd218 Fixes a bunch of missing clothes in the character creator (#29366)
* change

* more changes
2025-05-21 15:12:52 +00:00
Christasmurf
2eae3b82fc Explorer overalls recolour + minor tweaks (#29332)
* evplorer oxeralls

* forgotten cargo loadouts

* haha
2025-05-17 13:13:13 +00:00
Christasmurf
de2e87289b CMO & RD Drip (#29333)
* code code code

* all of the sprites

* final code?
2025-05-17 13:11:42 +00:00