4843 Commits

Author SHA1 Message Date
PollardTheDragon dbd680787c Tweaks space whales (#32011)
* Tweaks space whales

* Small adjustment

* Checks

* Lints

* Apply suggestion from @CRUNCH-Borg

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
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>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
2026-06-02 20:12:19 +00:00
Hayden Redacted 28b2c14f41 Adds a New Space Ruin: The Gas Station (#32004)
* initial commits

* linter fix and makes it more messy

* linter pt 2

* linter pt 3

* webedit heresy

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

* web editor heresy pt. 2

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

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
2026-06-02 02:10:48 +00:00
CRUNCH 9c10e38fbf Update zombie_virus.dm (#32044) 2026-06-02 00:15:42 +00:00
Hayden Redacted de37f97e8c Adds a New Space Ruin: The Kappa Lab (#31964)
* initial commit

* dirties it up a bit, adds some posters, and a pirate

* linter

* linter pt. 2

* adds a docking port, disposals, trash, and makes the lab only spawn once

* 1080p changes
2026-05-13 23:25:34 +00:00
Darkmight9 29c7691130 [EE] Adds space whale migration event as part of Event Extravaganza (#31946)
* Adding space whales

* Applies Pollard's requested fixes

* Update code/modules/events/whale_mirgration.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Darkmight9 <dominojohny@gmail.com>

---------

Signed-off-by: Darkmight9 <dominojohny@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-05-13 22:24:02 +00:00
BrickTheHooman 72610bb4a1 removes basic mob eating logging (#31975) 2026-05-10 08:08:02 +00:00
unknownuser782 13c3cc803c Ape Uprising (#31609)
* Allow monkey-like species to craft

* Add signal for mobs entering vents

* Implement basic uplifted antag datum & nest

* Make phrasing nicer

* Allow primitive species to vary & add time requirements

* Add spawning functionality to nest

* Make primitives unable to be humanised a little less violently

* Fix linter complaints

* Fix typo which made the linter mad

* Add objectives and antag teams

* Make nests consider other nests for spawn limit

* Add greeting text

* Add guaranteed early spawns

* Allow deconstruction of nests & recovery of scrap

* Allow uplifted mobs to ventcrawl with small items

* Clarify nest spawning conditions on examine

* Tweak NPC numbers & AI

* Add obtain objective and give an extra objective

* Give thanks to the linter

* Change team objective & make the alert nicer

* Make event only spawn monkeys by default

* Add examine text explaining deconstruction

* Allow ghosts to see nest materials

* Handle stacks properly in nest deconstruction

* Add on-demand ghost spawn to reduce roll spam

* Add nest crafting

* Allow lesser mobs to use medical stacks

I don't believe this should affect anything else, as every other mob capable of holding these items is an advanced tool user.

* Add hint about crafting on examine

* Ensure only nest monkeys retaliate to nest damage

* Add uplifted primitive nests to the spawners menu
2026-05-07 05:03:30 +00:00
Alan 0495f43b53 Unify style generators. (#31920)
* Unify hairstyle generators.

* Unify some body styling procs.

* Squash more duplicate logic.

* Change false value to define in link_processing.dm.

Co-authored-by: JimKil3 <47290811+JimKil3@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: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-05-07 05:02:06 +00:00
Alan b0a8b84dbf Add cardboard recycling. (#31937)
* Add cardboard recycling.

* Add more cardboard items to the recycling list.
2026-05-02 00:47:14 +00:00
CRUNCH 773dec7759 fixes zombie claws on cure (#31917) 2026-04-28 23:52:30 +00:00
Hayden Redacted a6818accea Adds Four New Nian Emotes (#31860)
* Adds the ability for nians to twitch their antennae.

* initial commit

* removes the underscore needed

* linter fix

* oops
2026-04-28 23:39:09 +00:00
PollardTheDragon a80e8cae9d Adds Wizard adept midround (#31784)
* Adds Wizard adept midround

* Fixes HUD bug

* Teaches fireproofing for sacred flame

* Teaches them better

* Mugwort compatibility
2026-04-18 23:00:15 +00:00
Alan 0e50aeb0b9 Trim _s from under sprite states. (#31861)
* Trim _s from under sprite states.

* Fix some missing icons.

* Restore missing chameleon icon state.
2026-04-18 21:10:16 +00:00
CRUNCH 8f842a2353 Adds Rations for the TSF, USSP, and ERTs (#31795)
* Creation

* revival AGAIN

* Update ration_pack.dm

* It returns yet again for the final time maybe

* e

* linter

* Update ration_pack.dm

* Update ration_pack.dm

* Update test_tiny.dmm

* Update bluespace_tap_spawners.dm

* Apply suggestions from code review

Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update rations.dm

* Update rations.dmi

* Update storage.dmi

* Update code/modules/food_and_drinks/food/foods/rations.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Polish icons in rations.dmi

* Update ration storage icons.

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2026-04-11 04:59:54 +00:00
PollardTheDragon 1d2566429c Nerfs Kingstons (#31809)
* Nerfs Kingstons

* Update kingstons.dm
2026-04-09 20:53:39 +00:00
PollardTheDragon 849e33e147 Adds dueling pistols (#31772)
* Adds dueling pistols

* Bonus damage for dueling

* Oops

* Sprite stuff

* Sprites and fixes
2026-04-09 20:45:31 +00:00
PollardTheDragon 394c3b0108 Stealth and Steel: The Space Ninja (#31497)
* Space Ninja Antag Datum

* Small fixes

* Ninja outfit, ekatana, actions

* Ninja scanner and spans

* Ninja uplink implant

* Ninja bombs

* Ninja bomb flare grants

* Ninja modsuit, objective payouts

* Fixes objectives

* Ninja stealth fix, modsuit sprites and final implementations

* Lints

* Ninja scanner sprites

* Ninja Suit and Energy Shuriken Sprites

* Fixes config, Adjusts stim ability, adds shuriken printer and e-shurikens, uplink stuff

* Fixes a duplicate icon

* Attack chain

* Energy katana item sprite

* Ninja net gun

* Brazil

* Spawning ninjas, ninja on traitor panel, ninja spawn sound

* Linter

* Objective stuff

* Fixes n grey suits

* Objectives

* Trim intro sound

* Event, spawn point

* Ninja Outfits, Vox Check, Bug Fixes, Mirror at ninja spawn

* Address code review

* Oops

* Uncomments an important thingy

* Update: Gave space ninjas access to maints and an agent ID card. Updated net description.

* Update scanner examine

* Removes excess file

* Makes ninja scanner fit in belts and ninja suits. Gives them NV goggles

* Fixes modsuit sprite issue

* Energy shuriken fixes

* Scanner fix

* Printer fix

* Fixes some runtimes

* Fixes capture teleport

* Clothes rename

* Buffs energy katana, adds soft no-drop to ekatana, buffs ninja modsuit, fixes equip bug

* Adds research levels to ninja gear

* Fixes ninja capture issue

* Remaps ninja dojo

* Better cuff removal

* Forgor

* Fixes action availability

* Updates walls at dojo

* Improves ninja modsuit

* Windoors can now be opened with the katana

* Adds advanced pinpointer to ninja uplink

* Fixed energy nets sticking

* Fixes slime people ninjas

* Adds reroll to ninja capture if target is DNR. Prevents off Z-level targets

* Oop

* Adds reactor sabotage objective.

* Fixes ninja cuffs

* Removes Carp scroll from uplink. Adds Krav Implant to uplink
2026-03-25 23:11:10 +00:00
Hayden Redacted 3e8f140498 Adds a New Lavaland Ruin: The Comfy Cabin (#31624)
* initial commit

* this shouldn't always spawn

* warriorstar suggestion

* suggestion pt 2
2026-03-25 13:39:55 +00:00
Miles 1395883465 Reopens 31014 - Changes to bug reporting storage and handling (#31763)
* initial work on migration to DB

* another step

* update report on submission

* syntax corrections

* syntax fix

* uses 2 bits to record rejections differently and makes the verb only create one bug report datum

* uses the correct value for the index this time

* fixes reading a specific bug report

* updates sql version

* oops

* changes the update file

* Update 71-72.sql

* adds detail to the comment in the update file

* remakes the bug report table instead of altering it

* change time2text for current time to SQL time

* selects columns explicitly

* change sql version in the code

* renamed load_to_db to save_to_db for clarity

* schema formatting and rounds can no longer be null

* messages all relevant roles when a bug report is made and also

* Prevents bug reports from being modified or handled by more than one person at a time

* Update tgui.bundle.js

* uses span macros in bug_report

* replaces usr with client var in bug report view proc

* Update debug.dm

* bundle rebuild, rest of reviews

---------

Co-authored-by: Migratingcocofruit <guycxz@gmail.com>
2026-03-23 17:26:55 +00:00
martcraft 2db68edb2e Adds emotes for multiple farm animals (#31733)
* added emotes for basic farm animals

* added new emotes to keybinds

* fixed some stuff
2026-03-23 05:41:12 +00:00
DGamerL 0399c43c18 Works (#31670) 2026-03-23 05:38:18 +00:00
Alan 392202d691 Add new sprites and coloring methods for basic jumpsuits. (#31568)
* Add new sprites and coloring methods for basic jumpsuits.

* Move palettes to dye_registry.dm. Add palette keys to jumpskirts.

* Add colored inhands, inventory sprites, icon and palette updates.

* Add jumpskirt item sprite.

* Add prisoner jumpsuit, psychedelic jumpsuit, random jumpskirt.
- Add new sprites for prisoner jumpsuits, skirts, and their rolldowns.
- Generate psychedelic jumpsuit icon in code, using colors it was originally composed of overlayed on the white jumpsuit.
- Add psychedelic jumpskirt, rolldowns, and inhands, since they are now easy to generate.
- Add a subtype for random jumpskirts patterned after random jumpsuits.
- Tweak orange color palette.
- Ensure randomized jumpsuits and skirts get the proper names and descriptions.

* Add dummy psychedelic suit sprites to satisfy linters.

* Attempt dyeing. Cleanup icon states. Update references.
- Moves jumpsuit coloring out of human_update_icons.dm to color.dm and updates dyeing.dm to hopefully enable dyeing. In the current state it only colors object sprites properly.
- Deletes icon states that will no longer be used for each solid color jumpsuit.
- Updates references to old icon states in datacore.dm, character.dm, and chameleon.dm to the white icon with a swapped palette where possible.

* Thanks, linters.

* Thanks, linters. part 2

* Fix dyeing. Add misc prison jumpsuit sprites.

* Dye chameleon jumpsuit when it mimics colored jumpsuit.

* Eliminate chameleon lag by caching jumpsuit icons.

* Add missing keyword args. Thanks, linters.

* Replace resistance flags in black jumpsuit.

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

* Tweak jumpskirt shading on south humans and greys.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
2026-03-22 22:24:02 +00:00
Pooble aaeb5fdf28 Skin Masquerade: Epidermal Applicator, Lifelike Quirk, and the Skinmonger Implant (#31185)
* adds the epidermal applicator, lifelike quirk, and skinmonger traitor implant

* lint

* lint

* attack chain fix

* more linty fixes

* more lint

* fix some buggy bugs, synthetic skinned body parts recolor to their host

* make emp on skinmonger work, fix a skinmonger bug

* make bruising / denting examine text not betray the masquerade

* burn away synthetic skin with acid

* comment / code structure / description tweaks

* i sell pharmaceuticals and pharmaceutical accessories

* code review comments

* oops

* god damn it

* god damn it (x2)

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

* lower syndi level for implant

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

* Update code/game/objects/items/tools/epidermal_applicator.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

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

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

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

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

* tweaks for review

* Update code/__DEFINES/dcs/datum_signals.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>

---------

Signed-off-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
2026-03-22 22:08:25 +00:00
Hayden Redacted 9dc4ba7071 Adds a New Station Trait: Lights Out! (#31712)
* initial commit

* linter fix
2026-03-13 19:45:56 +00:00
Hayden Redacted a3fdee114e Adds 4 More Asteroid Space Ruins (#31614)
* first two asteroids

* last few asteroids

* added the configs

* dgamer fixes
2026-02-27 20:19:05 +00:00
Christer2222 b5eabdf1a9 You can now stick forks into outlets (#31435)
* now shocks

* machines + added get_internal_wires

* removed duplicate variable on syndicatebomb

* adds wire tearing, check if the door has a plating

* return a few item_interaction_complete

* linting + unpowered message

* removed some checks  + floodlights + ChemMaster

* cut_random_uncut() -> cut_random_uncut_wire()

* simplified random wire selection

* return ..() + removed /

* early return if not machine

* get_internal_wires() comment

* attackchain

* attackchain + comment removal

* duplicate variable removal

* removed extra lines

* removed some / + removed unnecessary checks

* removed uncut wirecount function + extra check to cooking machinery

* attack chain signal

* space

* removed some \thes
2026-02-17 19:12:09 +00:00
Hayden Redacted 87a1e11667 Adds a New Lavaland Ruin: Basalt Laboratory (#31523)
* initial commit

* oops

* oops

* i can english

* this shouldnt always spawn
2026-02-17 17:51:00 +00:00
PollardTheDragon f2b81ea285 Adds basic megafauna: Bluespace Horror, Vox Armalis (#31480)
* Adds basic megafauna: Bluespace Horror, Vox Armalis

* Armalis improvements, code review addressed

* Lints

* Update code/modules/mob/living/basic/hostile/megafauna/basic_megafauna.dm

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

* Update code/modules/mob/living/basic/hostile/megafauna/bluespace_horror/bluespace_horror.dm

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

* Update code/modules/mob/living/basic/hostile/megafauna/vox_armalis/vox_armalis.dm

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: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-02-12 01:23:19 +00:00
DGamerL 55c351f4ee Liver rework (#31410)
* Remove old stuff

* Liver expansion

* Slimepeople don't take constant tox damage

* oops

* Makes this use the helper

* Oops

* Fixes

* Oops

* Capitalization

* Comment update
2026-02-12 01:22:46 +00:00
warriorstar-orion 9238ae0f0e add the ability to build airlock chambers (#31514)
* add the ability to build airlock chambers

* fix identical variables lint

* switch to span macros

* make return values consistent

* can remove access elecs with crowbar
2026-02-11 22:28:54 +00:00
PollardTheDragon 33652c77c9 Adds basic hostile silicon mobs: borgs and mechs (#31481)
* Adds basic hostile silicon mobs: Cyborgs and Mechs

* DVORAK

* Map fix

* Apply suggestion from @Burzah

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

* Update code/modules/mob/living/basic/hostile/silicon/hostile_mechs.dm

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

* Apply suggestion from @Burzah

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

* Update code/modules/mob/living/basic/hostile/silicon/hostile_mechs.dm

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

* Update code/modules/mob/living/basic/hostile/silicon/hostile_mechs.dm

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

* Update code/modules/mob/living/basic/hostile/silicon/hostile_mechs.dm

Co-authored-by: Burzah <116982774+Burzah@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: Burzah <116982774+Burzah@users.noreply.github.com>
2026-02-11 22:20:27 +00:00
PollardTheDragon 08df09ec16 Buffs Breach Cleaver (#31576) 2026-02-09 14:27:37 +00:00
chuga-git 118785d5d2 prevent heretic summons from breaking end round completion text (#31617) 2026-02-08 05:09:23 +00:00
PollardTheDragon 5d5b3c04c8 Adds vox admin outfits, tweaks vox suit values (#31482)
* Adds vox admin outfits, tweaks alien suit values

* Fixes
2026-02-06 11:12:16 +00:00
PollardTheDragon 887b3348c0 Adds IK-134 laser gatling gun (#31483)
* Adds IK-134 laser gatling gun

* Attack chain

* Fixes spread

* Linter

* Apply suggestions from code review

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

* Update code/modules/projectiles/guns/energy/laser_gatling.dm

Co-authored-by: JimKil3 <47290811+JimKil3@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: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2026-02-06 00:25:04 +00:00
azulez 0f99799bac SolGov Marine Snacks (#31501)
* Adding SolGov Marine Snack (rev 1)

* Added crayon-mannitol, flavors, and every color of the rainbow.

* Polling complete

* Minor fixes for lines and commas, because of course.
2026-02-05 06:12:33 +00:00
PollardTheDragon ec7005b7c5 Monkey AI Fixes (#31504)
* Fixes monkeys breaking from grabs, fixes monkeys not stopping on stamcrit

* istype checks
2026-02-05 06:08:50 +00:00
Toastical 20da79f393 fix breathing runtimes (#31566) 2026-02-05 05:34:22 +00:00
BiancaWilkson dee06075a4 Fixes helmets sometimes getting stuck on the screen after closing your inventory (#31512)
* Removes extraneous call

* Whoops
2026-02-01 04:03:23 +00:00
Toastical 8fff8f67b6 fix touch spells initializing without a spell (#31562) 2026-02-01 03:59:10 +00:00
Kyani 203105788c [IDB Ignore] Heretic: The Mansus Re-Opened (#30738)
* fixes

* fuck my stupid chungus life

* Minion limit, heal fix, dead sac fix

* cooldown, no sacrificing star gazer or ascended alive heretics

* blade debuff

* oopsy

* Update tgui.bundle.js

* map diff bot what ya doing

* fuck that chat spam

* lets heretic armour hold a haunted longsword

* why not it makes sense

* do_after

* god I hate this bullshit

* other lewc stuff

* push

* heretic id card fix

* she tg on my ui till I css

* yes

* spent

* fix / ipc buff (real)™️

* moderate again

* revert

* no reserve

* bringing up to master

* update map files to master

* didnt replace centcomm

* beginning some rebalancing

* aggressive spread tweaks

* lots of tweaks and fixes

* trying to un-key the maps

* maybe this time

* this time????

* oops

* sql fix

* basicmob conversion

* paintings! and a critical influence fix

* rust + tweaks

* monster tweak

* small change

* removing this

* more tweaks. no more dusting

* added some examine_more

* flower seeds

* various tweaks. more to come

* no more conduit spacing

* fixed some dumb stuff

* silly stuff

* its always prettier

* bugfixes and linters

* linters, wow

* oops

* bah

* linter

* fuck you

* temp check

* hidden influence drain

* influence visible message

* tweak fix

* void cloak bugfix

* small fixes

* fixes

* do_after_once broken

* fixes and tweaks

* heretic blade potential fix + sacrifice changes

* batch of fixes

* tiny tweak

* rebuilt TGUI

* no greentext + rerolls

* logging + bugfix

* unused var

* small fix

* various fixes

* comment

* projectile change

* tgui rebuild

* tgui bundle redo

* rune issue solved

* influence visible now

* fix ui reloading

* new moon ascension + fixes + icons

* tweaks, species sprites

* tgui rebuild

* small tweak + linter

* harvester icon tweak

* spans

* fixes and tweaks

* caretaker nerf + tweaks

* potential fix for knowledge

* roller fix

* mad mask

* Update tgui.bundle.js

* void phase tweak

* Update tgui.bundle.js

* misc tweaks

* fix heretic not retargeting correctly with cryo

* simplify logic

* this is better

* lots of fixes and tweaks

* Update tgui.bundle.js

* linter

* linter

* fireshark and greyscale insanity

* fish

* Update tgui.bundle.js

* linter

* linter

* tgui

* no window shopping

* fish fix

* tgui rebundle

* moon smile runtime fix

* various fixes

* sacrifice fixes

* insanity is easier now, madness mask changes.

* bugfixing + teleport change

* linters + tweaks

* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm

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

* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm

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

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Paul <pmerkamp@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-01-27 20:36:52 +00:00
Toastical 70b9bed2c3 Add pingability to staff-say, dev-say and mentor-say (#31377)
* Add pingability to staff-say and dev-say

* Consolidate all pinging to a proc, add it to mentor-say

* Make pings work with ckeys regardless of stealth-mode
2026-01-27 01:46:00 +00:00
PollardTheDragon 369804d665 Fixes mobs talking in dchat (#31502) 2026-01-27 01:31:00 +00:00
DGamerL 41dbc763bf Bug report newline (#31516)
* Bug report newline

* Debug removal
2026-01-27 01:30:06 +00:00
Alan 3821fec517 Recolor headwear when adjusted for Skkulakin. (#31464) 2026-01-26 15:15:09 +00:00
PollardTheDragon 095f93c416 Converts mimic mobs to basic mobs (#31424)
* Converts mimic mobs to basic mobs

* Unit tests

* Units
2026-01-25 22:56:44 +00:00
CRUNCH 489063ba73 Allows the Recycler to Recycle Wood (#31442)
* Update recycler.dm

* Update material_container.dm

* Update code/game/machinery/recycler.dm

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2026-01-25 08:21:02 +00:00
Contrabang f3be56d858 adds a *gulp emote (#31467)
* best PR ever

* FUCK
2026-01-25 03:49:01 +00:00
PollardTheDragon 3af7e3c1b4 Adds ability for nians to open and flap their wings (#31132)
* Adds ability for nians to open and flap their wings

* To chat fixes

* Add missing open moth wings. Adjust hind wing positions east/west/south.

---------

Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
2026-01-21 14:15:05 +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