cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-19 04:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,545 Commits 10 Branches 2 Tags
master
Commit Graph

4928 Commits

Author SHA1 Message Date
AurouraPlays 53c9cbec6b Removes recipe conflict between Vampiro and Margarita (#32095) 
* Removes recipe conflict between Vampiro and Tequila

* Fixes the amount of Vampiro returned to match the sum of its parts.

* Fixes Tequila Sunrise's ID in the vampiro recipe

* Correcting formatting in manuals.dm

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

---------

Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
 2026-06-13 22:19:08 +00:00
AurouraPlays 5657dcdb89 Adds Strawberry Daiquiri and Miami Vice. (#32069) 
* Adds Strawberry Daiquiri and Miami Vice.

* Fixes the amout returned in the Miami Vice to equal the sum of its parts, and increases the alcohol percentage.

* Adds Strawberry Daiquiri and Miami Vice to the drinks manual.

* Corrects the formatting and alphabetization of manuals.dm entries.
 2026-06-13 22:18:52 +00:00
Alan 25aac32c63 Migrate /obj/item/assembly to the new attack chain. (#31987) 
* Migrate /obj/item/assembly to the new attack chain.

* Migrate more procs.

* Add parent calls to activate_self().

* Add parent call to activate_self() in noise sensor.

* Apply CRUNCH's style suggestions.

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

* Change igniter attack to interact_with_atom().

* Restore assembly UIs.

* Ensure assembly interact procs fire, ensure fingerprints.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-05-17 18:42:49 +00:00
PollardTheDragon 6b9c333636 Adds Security Fines (#31857) 
* Adds Fines

* Forgot one

* Enhanced Clarity

* Fixes issue with linked account

* If no crime stated, states in the fine message

* Updates fine scanner sprite

* Updates fine scanner behavior

* Adds comment to records

* 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>

* Removes capitalization

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2026-05-17 09:45:07 +00:00
Alan e3e6bae1c9 Add drinks and recipes from Hispania! (#31983) 
* Add drinks and recipes from Hispania!

* Fix duplicate var in bottle.dm. Thanks, linters!

* Add fitness cups to stations, BSH loot.

* Dull some glass rims that don't need to be quite that bright.
 2026-05-15 14:56:42 +00:00
CRUNCH 8fe4bf5ded blind cane craft (#31962) 2026-05-13 22:11:06 +00:00
PollardTheDragon 7a5658a90a Improves Baseball Bat Deflect Mechanics (#31918) 
* Improves Baseball Bat Deflect Mechanics

* Adjustments

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

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

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

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

* Reorders if chain

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2026-05-07 02:21:59 +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
Alan 45b4859c99 Add mug cakes. (#31919) 
* Add mug cakes.

* Remove duplicated var. Thanks, linters!

* Add mug cakes manual.
 2026-04-29 00:10:57 +00:00
Alan 01b55e0f21 Change some items to zero damage hitsounds. (#31854) 
* Change some items to use zero_damage_hitsound.

* Remove duplicate var. Thanks, linters!

* Use Contra's method for zero damage hitsounds.
 2026-04-28 23:38:50 +00:00
Hayden Redacted 55e42f53a5 Make the Supermatter Crystal More Senstive and Adds More Events (#31767) 
* initial commit

* oops i forgot to commit this

* Tidies up the SM manual, clamps the A-4 damage, and fixes a linter

* removes the change to operational temperature

* buffs the flood event

* Update code/modules/power/engines/supermatter/supermatter_event.dm

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

* Update code/modules/power/engines/supermatter/supermatter_event.dm

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

---------

Signed-off-by: Miles <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-04-21 05:03:31 +00:00
CRUNCH 3c1d985e31 Attack Chain Migration: Grenades & Plastic Explosives (#31874) 
* Update bomb.dm

* migration

* Fix CI

* Update mining_charges.dm

* Update deployable.dm
 2026-04-21 04:58:44 +00:00
CRUNCH bea76c4592 Attack Chain Migration: Tanks (#31873) 
* tanks attack chain migration.

Tanks, you're welcome. Now with less curses.

* AGGGHHHHHH!
 2026-04-18 21:11:21 +00:00
CRUNCH 5047c35ed3 Adds Durkehiet, removes Howler (#31844) 2026-04-13 23:46:01 +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 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
CRUNCH 05eeff6df2 Fixes a Bunch of RCL Bugs (#31698) 
* RCL cable migration

* e

* Pain and death

* merge master fixes

* e

* aaaaaa

* Update RCL.dm

* AaaaAAAAA

* Update cable_coil.dm

* Update cable_coil.dm

* returns throwforce

* removes color feature

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-04-09 02:50:24 +00:00
PollardTheDragon 01726c44b5 Adds logging for if a grenade is primed by damage received (#31761) 2026-04-03 20:24:31 +00:00
CRUNCH d030b8afb8 Migrates /obj/item/stack to the new attack chain (#31709) 
* e

* stuff not in the stack folder

* A

* Update gift_wrappaper.dm

* golg

* dancing around SHOULD_NOT_SLEEP and storage still being legacy

* Update asteroid_floors.dm

* Update medical_packs.dm

* Update medical_packs.dm
 2026-04-02 02:32:15 +00:00
PollardTheDragon 87c2a19ecd Adds Mafia Boss Syndicate Kit (#31701) 
* Adds mafia boss syndicate kit

* Comment update

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Miles <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: Miles <116982774+Burzah@users.noreply.github.com>
 2026-03-29 02:17:15 +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
Alan aed493d9a1 Add new null rods for various religions. (#31393) 
* Update holy_weapons.dm

* Update holy_weapons.dm

* Add some new nullrods for various religions.

* Update inhands for gohei, whisk, goad.

* Tweak several nullrods.
- Modify weight classes for kirpan, vajra, ganta, gohei, and whisk
- Reduce force of vajra
- Nudge kirpan sheath sprite in belt slot
- More progress on getting vajra and ghanta to equip properly (should be one in each hand when equipped and none inhand if not) (still needs work)

* rod of null

* Update holy_weapons.dm

* Remove force from cleansing nullrods. Rename curved saber.

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

* Remove unknown proc 'is_in_inactive_hand'.

* Partially fix whisk knockback.

* Fix whisker knockback.

* Thanks, linters! part 2

* Change vajra to weapon and ghanta to tile blessing.

* Thanks, linters. part 3

* Call ghanta's activate_self() parent more wisely.

* Tweak visible and audible messages.

* Thanks, linters!

* Fix some of the wackiness with Vajra pickup.

* Prevent ghanta from being placed somewhere all alone.

* Handle some cases where vajra equipped to wrong hand.

* Tweak nullrod documentation.

* Update icon on sheaths when initializing.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: Fordoxia <Thrash97@googlemail.com>
 2026-02-27 20:07:25 +00:00
MixityMaxity c4fb9bff75 Adds seven alternate finishes for the .357 Revolver (#31668) 
* Adds Syndie Subtype and extra finishes

* Switches all mentions of standard revolver to the new syndicate version

* Wait why are we spinning the *barrel*

* removes duped name and description
 2026-02-27 19:07:58 +00:00
Alan ae181bf265 Make fanny packs dyeable. (#31676) 2026-02-27 19:06:58 +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
CRUNCH bec388228b Migrates /obj/item/clothing to the New Attack Chain (#31421) 
* the beginning of my torment

* This was a very small piece of torment

* God agghhghhhh the suffering

* pain and suffering and destruction

* Update bot_construction.dm

* Update heretic_necks.dm

* Update heretic_armor.dm

* Apply suggestions from code review

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

* Apply suggestion from @DGamerL

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-02-09 19:36:38 +00:00
PollardTheDragon 08df09ec16 Buffs Breach Cleaver (#31576) 2026-02-09 14:27:37 +00:00
Hayden Redacted 7eee17f7a1 Changes the Ripley manual to Say Plasteel Instead of Reinforced Steel (#31603) 2026-02-06 16:13:34 +00:00
CRUNCH 56d131c6ac Buffs the Rapid Cable Layer and Puts it in the Hands of People (#31513) 
* cables

* RCL deployment

* Update RCL.dm

* procedural colour woo

* Update RCL.dm

* Update RCL.dm

* Update RCL.dm

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-02-05 06:27:32 +00:00
CRUNCH da1ebd039d Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445) 
* Holy fuck there's so much shit I'm not even done

* oh god there's so many

* it is done

* Update autolathe_designs.dm

* Update circuitboard.dm
 2026-01-30 21:25:40 +00:00
Toastical 4c74b78a18 migrate all /obj/item from /New() to /Initialize() (#31232) 
* migrate all /obj/item from /New() to /Initialize()

* move GLOB.chemical_reagents_list creation to /world/New()

* review

* oops

* autodoc a smart var
 2026-01-28 19:44:32 +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
warriorstar-orion 4b2661c6d0 use ABSTRACT_TYPE_DESC in more places (#31409) 
* use ABSTRACT_TYPE_DESC in more places

* fix lint

* fix fucking everything else

* there was more

* fix meta and dgl review

* fix lint
 2026-01-25 22:52:12 +00:00
PollardTheDragon 7ec133a329 Adds Holy Hand Grenades (#31293) 
* Holy Hand Grenade

* Lints

* Fixes RND levels

* Adjusts timer to 5 seconds

* Linters

* Tints HHG Shrapnel

* Kills revs dead

* Big damage instead of death

* 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>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2026-01-25 22:08:29 +00:00
CRUNCH 2d636ff764 Migrates Null Rods to the New Attack Chain (#31370) 
* Update holy_weapons.dm

* Update holy_weapons.dm
 2026-01-24 06:15:21 +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
CRUNCH ee13dce3e1 Borg Push Broom Icon Updates When Braced (#31255) 
* broom

* Apply suggestions from code review

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

* Update code/game/objects/items/robot/robot_items.dm

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-27 09:35:27 +00:00
PollardTheDragon a590870d00 Monke Business - Ports monkey AI from TG (#31067) 
* Monke Mode

* Punch

* Some comment stuff

* Linters, excess

* Linters

* Emote stuff

* Pause monkey AI during do afters

* Small improvements

* Oops

* Fixes monkeys trying to drink forever from a glass

* Knockdowns and stamcrit fixes

* Removes eating/drinking from Pun Pun

* Monkey controller improvement, bug fix

* Fixes monkey item giving

* Fixes brain swaps

* Fixes

* Update code/datums/ai/monkey/monkey_controller.dm

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

* Addresses code review

* Oops

* Oops round 2

* Fixes monkeys staying in trip mode when evolved

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-12-26 22:44:52 +00:00
Vengie0 65441316e7 Turns off quick gather for duffel bag's and add's a duffel bag zip/unzip notice in chat. (#31281) 
* Rebinds the duffelbag keybind to Alt+Click to prevent conflicting keybinds related to it.

* rebinds the unzip/zip hotkey back to what it was before and just removes the pickup_all_on_tile message at the bottom right for duffelbag's.

* Rearranges visible_message and replaces SPAN_WARNING to SPAM_NOTICE.

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

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Vengie0 <zaydrabah11@gmail.com>

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

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Vengie0 <zaydrabah11@gmail.com>

---------

Signed-off-by: Vengie0 <zaydrabah11@gmail.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2025-12-26 22:21:32 +00:00
Alan 4af014d720 If a buckled mob enters a bear trap, damage buckled object (#31192) 
* If a buckled mob enters a bear trap, damage buckled object

* Amend comment whitespace.
 2025-12-26 21:03:40 +00:00
CRUNCH ee228cdb6b Migrates restraints to the New Attack Chain (#31310) 
* e

* Update legcuffs.dm

* Update umbrae_powers.dm

* Update code/game/objects/items/weapons/legcuffs.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-26 10:50:42 +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
Christer2222 33dff2756e Adds a description to C4 and X4 showing you can set a timer (#31308) 
* description

* new description
 2025-12-25 21:00:41 +00:00
CRUNCH d360ca18cc Fixes Chemthrower Fire Burning Mobs That Don't Care About Fire (#31316) 
* fire

* Update fire_effect.dm
 2025-12-19 13:10:59 +00:00
warriorstar-orion 481f035722 Metastation kitchen area redesign and related features, take 2 (#30754) 
* Metastation kitchen area redesign and related features, take 2

* reviews
 2025-12-18 23:46:17 +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
Hayden Redacted 5728e0c46f Adds Water Vapor and the Electrolyzer (#30875) 
* this will work first try (adds water vapor and the electrolyzer)

* naming fix

* removes a warn

* makes water vapor able to be seen and adds it to the tiny_test atmos map

* Build Rust library

* adds the electrolyzer to all maps, and linter fix

* linter fix part 2

* electrolyzer tweak and more work on the test_atmos map

* tgui rebuilding

* re
rebuilding tgui

* makes the electrolyzer consume power and some small test atmos touch ups

* im axing the test_tiny because i don't want to map it

* clarifies how much power the electrolyzer uses

* Build Rust library

* suggestionss

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* updating the SM manual

* electrolyzer tweaks

* dg suggestions pt. 2

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

* removed unused code

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@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: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2025-12-10 00:04:11 +00:00
DGamerL ead98c299a Fixes a bunch of bugs with chemical flamethrower canisters (#31177) 
* Finally got around to this

* Killing the linters

* Apply suggestions from code review

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-09 02:50:17 +00:00
PollardTheDragon 9248c028b1 [PTBF] Example PR: Kill Station Pet (#30650) 
* Pet Assassination

* Antag rolls

* Adjusts weights to equal 1000

* Map deconflict

* Linter

* Update code/game/gamemodes/objective.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>
 2025-12-05 22:16:33 +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