Commit Graph

25 Commits

Author SHA1 Message Date
Alan
86834604b3 Fix a bug related to storage gathering. (#31449) 2026-01-18 00:33:19 +00:00
AVeryReluctantSpider
6a1fc4f5c2 Praise Be and Skkula: The PR (Skkulakin Race 2025) [READY FOR REVIEW] (#30744)
* skulk.dm placeholder for testing purposes

* Made an oopsie, fixed

* Skulk flesh color and language color testing

* Adding working language key, fixed language color

* Changed skulk flesh color, may change it again soon

* Ran tgui, hopefully fixed language color

* Changed skulk language color, hopefully for good this time

* Missed a spot

* Tgui fuckery

* If at first you don't succeed, cry to yourself for a bit then try again

* Tgui makes me violent

* Eyewear no longer save Skkulakin from flashes

* Skulk bones now hurt really bad

* Adds Skulk Sprites, Back Accessories, and other Placeholders

* Desperately trying to get body_accessories to work

* Minor name changes

* Skkulakin now have colorable eyes

* Makes the silk-spinning ability somewhat work, more changes need to be made

* Fixes the Skulks' ability to spin silk, however still needs changes

* Changed Skulks easier bone breaks into a trait

* Skulks (Now with 100% ethically sourced back spines!)

* Gives Skkulakin the Vox clothing sprites (Not counting head, glasses, or masks)

* Added update_spines_layer() for testing and help purposes

* Working on getting Skulk Backspines to change color depending on preset

* Skulk Backspines are now colored the same as your preset up spawning in (Thank you, Qwerty)

* Undefines SILK_NUTRITION_AMOUNT (I made a woopsie)

* Readds a return I may have accidentally removed at some point

* Skkulakin can now chitter

* Silk now be used to craft cloth and has an icon

* TGUI is going to make me do things

* Fixes the Brittle Bones Trait to work with Frail Quirk

* Sprite Fix

* Adds masking helpers

* Made a small woopsie

* I'm genuinely a fucking idiot

* Adds a bunch of new clothing

* Changes some clothing descriptions

* Fixes more placeholders and adds two new outfits

* Made small mistake, fixed

* Temporary change (Will revert soon)

* Reverted previous changes as the event is now over

* New Skulk Clothing, added some to the racial tab in the loadout, and made low-inquis robes orderable from cargo

* Adds High-Inquis Robes into cargo console

* Adds Skkulakin Flag (Orderable From Merch Vendor)

* Made small mistake, fixed it

* Inquisitorial Crate only has Low-Inquisitor clothing again

* Commits all offered suggestions

* Converts spans to defines and sorts out the rest of Skulk clothing (No MODs just yet)

* Gives Skulks the Nian Butt Sprite for now

* Fixes a small error with biosuits

* Fixes small coding error

* Fixes a few mor small coding errors

* Update code/modules/mob/living/carbon/human/appearance.dm

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

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

* Update code/modules/economy/merch_items.dm

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

* Removes 'collective' from outfit_admin.dm

* Basic Pixel-Shifting (Not Yet Complete)

* improve skulk headwear offset

* Revert "improve skulk headwear offset"

This reverts commit 2d93d61699.

* improve skulk headwear offset

* Cleans up some code and fixes ALL hats for Skkulakin

* Lets the AI speak Skkula-Runespeak, fixes Bomber Jackets and Winter Coats, makes Backpacks look better, fixes other small sprite issues

* Let them wear pants

* Update code/modules/mob/language.dm

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

* Fixes masks and glasses for skkulakin

* Fixes Inquisitor Masks and adds missing Engineering Outfits

* Fixes Explorer Suits and HECK Suit for Skulks

* Fixes a few small issues and resolves some suggested changes

* Rebuilds TGUI

* Fixes Science Jumpsuits & Radsuits

* Fix Skkulakin chef belt disappearance.

* fix string assoc lookups for alists

* Update code/game/objects/structures/mirror.dm

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

* Update code/modules/mob/living/carbon/human/species/skulk.dm

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

---------

Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2026-01-17 20:54:56 +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
58ce2e0d05 Fix a bug related to storage transfer. (#31353) 2025-12-26 05:52:17 +00:00
CRUNCH
eeb980f191 Adds Reycleable Materials to a Bunch of Objects (#31320)
* recycle

* moar

* Update glass_containers.dm

* Update spray.dm

* cost adjustment because sheets are 2000, not 1000

* Update hydroitemdefines.dm

* Update hydroitemdefines.dm
2025-12-25 21:03:22 +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
Contrabang
ef7e48db9c Makes a ton of dirs into defines (#31244)
* Makes a ton of dirs into defines

* lol oops

* "fix"

* ignore everything
2025-12-12 20:32:33 +00:00
Alan
439b610530 Replace captain's garment bag with CapDrobe (captain's dresser-wardrobe). (#30885)
* Replace captain's garment bag with CapDrobe.

* Incorporate feedback
- Restore chef vendor items from a stash apply gone wrong
- Make captain's gloves free
- Make basic captain wardrobe items more numerous
- Correct CapDrobe broken icon state name

* Fix small map error.

* Convert 'capdrobe' to a lockable dresser-wardrobe.

* Notify silicons of items they remove from wardrobes.

* Apply recommendations from review.
2025-12-08 22:00:52 +00:00
Alan
3af59de586 Update Research Director's suit and skirt, re-add (#30848)
* Update rd's old suit and skirt and re-add them

* Thanks, linters!
2025-11-10 16:32:38 +00:00
Qwertytoforty
b74375d118 the dead don't rise and nanopaste helps: organ edition (#30712) 2025-10-26 13:11:34 +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
Qwertytoforty
3c7ca73c04 Gives many cybernetics on mob sprites. Adds synthetic skin to allow hiding of them. (#30098)
* the first half

* rest of the skin

* duplicate

* new sprite / updated description / no more yell at me

* the rest of the owl

* oops, fixed
2025-10-06 18:30:31 +00:00
PollardTheDragon
e29ace7bcc Fixes botany bag bit runtime and other bugs (#30597) 2025-10-02 01:23:02 +00:00
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
Osetrokarasek
b9581ce380 Adds New "Carcinoma Angel" Cigs (#30338)
* vkfdnvhy

- Added "Densed Nicotine" reagent, which is similiar to Nicotine, but has lower overdose threshold, is not addictive and also deals minor lung damage, makes people cough, sends evil messages to user
- Added "Carcinoma Angel" cigs which contains "Densed Nicotine". They can be found in hacked or syndie/beach cigarette vendors or in maints as loot.

* Update drugs.dm

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* cough... new()...

* Update cigs.dm

* Update fancy.dm

* Update drugs.dm

* Update cigarettes.dmi

* Update cigarettes.dmi

* Update cigarettes.dmi

* Revert "Update cigarettes.dmi"

This reverts commit 831790523e.

* Update cigarettes.dmi

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-09-19 14:24:59 +00:00
Osetrokarasek
5e29e1ff0c Resprites Medkits (#30194)
* vloebjud

* vmjencjsv

- added inhand sprites

* ldfsovjnah

- Fixed icon for tactical kit

* bmjuamkvbf

- Fixed icons for ancient kit

* Update firstaid.dm

* fjdyvygt

- Review thingy

* Update firstaid.dm

* adsdada
2025-09-18 06:09:10 +00:00
Ahzpy
bd911799b8 Librarian Drip Expansion (#30167)
* all the sprites in the wrong place

* suits are now in the suit files

* code and whatnot

* oops all config

* hand holes, locker, garment bag, loadout

* adds locker to every station

* some fixes

* pleases review overlords

* fixes errors?
2025-09-16 18:59:32 +00:00
CRUNCH
763bd32861 The Smoking Expansion DLC II - The Second Puff (#30334)
* King's Own Tobacco

* Update cigs.dm

* cigar boxes

* badass

* CI

* CI (again)

* Update centcomm.dmm
2025-09-15 12:39:13 +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
Osetrokarasek
641d05863c ddd (#30339) 2025-09-11 03:17:48 +00:00
Contrabang
5b0447edcc Makes automenders rarer. Adds sutures/regenerative meshes. (#30003)
* suture

* tweak

* bio 6 -> bio 7

* tweak bleed supression

* review

* Update code/game/objects/items/stacks/medical_packs.dm

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2025-08-17 20:12:44 +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
Burzah
a5c2080c9d Fixes nullspace inventory issue (#30092)
* storage test

* an actual fix

* removed wrapper
2025-08-12 08:38:51 +00:00
Charlie Nolan
8ffefd8777 Move all the non-weapons out of code/game/objects/weapons (#29820) 2025-08-06 01:37:56 +00:00