cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-06 14:03:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,386 Commits 15 Branches 2 Tags
0e50aeb0b958ff79e702cab0c46377a93bfb5621
Commit Graph

11802 Commits

Author SHA1 Message Date
CRUNCH 91dd3e55c9 allows stack splitting mechanics to be disabled (#31911) 2026-04-17 00:21:18 +00:00
Alan a714de9149 Add beach towels. (#31667) 
* Add beach towels.

* Add basic towel. Attempt absorbency. Add towel names.

* Make towels pick up and spread blood.
Move towel place-on-floor function to beach towels.

* Move amount to base cleanable. Refine towel procs.

* Ensure towel picks up blood.

* Add species sprites and inhands.

* Apply suggestions from code review.

* Fix ussp space ruin.

* Whitespace.

* Prevent picking up blood DNA already on the towel from mobs/items without decal amounts.
 2026-04-14 16:24:53 +00:00
PollardTheDragon cf80c0b2b1 Fixes isopod oversight (#31898) 
* Fixes isopod oversight

* Fixes some naming too
 2026-04-14 04:13:18 +00:00
Contrabang d4595054ce Adds CI for checking if a variable exists (#31855) 
* i leave for one month smh

* feature compatibility

* fixed
 2026-04-14 03:26:31 +00:00
PollardTheDragon fb29bc6f4f Adds Isopods (#31842) 
* Adds Isopods

* Fix

* Moved some values

* Om nom nom

* Pickups

* Linters

* Adjusted name
 2026-04-14 03:16:49 +00:00
CRUNCH 5047c35ed3 Adds Durkehiet, removes Howler (#31844) 2026-04-13 23:46:01 +00:00
Toastical 9b5ed1f9e1 fix ore bag pickups for cyborgs (#31867) 2026-04-13 23:32:23 +00:00
CRUNCH 166ccc1a35 Update RCL.dm (#31889) 2026-04-13 23:31:58 +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 62392cb2a8 Fixes infinite soap mouth (#31835) 2026-04-10 00:20:52 +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
Alan ba5db365e3 Adjust earwear for monitor heads. (#31775) 
* Adjust earwear for monitor heads.

* Tweak soviet headset, correct icon code.
 2026-04-09 04:21:23 +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 c6620a0c96 Adds Cargo Drop Pod Collision Moderate Event (#31771) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2026-04-07 14:39:31 +00:00
CRUNCH 48ffe9dd63 Update stack.dm (#31850) 2026-04-07 03:41:35 +00:00
Alan e9fcd1b035 Adjust masks to fit monitor heads. (#31773) 
* Adjust masks to fit monitor heads.

* Remove duplicate var. Thanks, linters!

* Tweak west-facing lucha masks.
 2026-04-05 05:16:32 +00:00
PollardTheDragon 01726c44b5 Adds logging for if a grenade is primed by damage received (#31761) 2026-04-03 20:24:31 +00:00
Hayden Redacted 1b798b2155 Adds Paradise Trading Cards! (#31756) 
* Initial commit

* oops no warns allowed

* linters along with descriptions, psych, forklift, and brad cards

* i can read errors, trust

* yes

* more linter

* remove extra declaration

* identical var fix

* Pollard suggestions

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

* removes some comments and renames some TCG branded things

* CRUNCH's attack chain migration

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

* various icon and adds packs to maintenance loot

* moved some coin stuff around and linters

* Coin icon fix and adds them to the NT merch vendor

* linter fix

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-04-02 20:00:37 +00:00
Alan a7971e4af9 Add sand sculptures. (#31760) 
* Add sand sculptures.

* Apply suggestions from review.
 2026-04-02 02:37:19 +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 a3e015b921 Fixes tape breaking bluespace light replacer icons (#31799) 2026-03-30 13:33:40 +00:00
Alan 082cc586b3 [s] Fix suture stacks. (#31787) 
* Fix suture stackification.

* Apply 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>
 2026-03-29 06:40:00 +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
Alan 61a0e6df61 Add a plushie picker box. (#31753) 2026-03-26 02:42:18 +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
CRUNCH 6802e164a2 Update soap.dm (#31718) 2026-03-23 05:41:22 +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
anokspy 1a4df5b339 Adds Departmental Cowboy Hats (#31699) 
* Adds le hats

* kidan hat fitting

* tan hat existence restoration

* run you POS icondiffbot

* attempt 2

* Cargo hat emblem recolor

* bluespace? more like WHITESPACE
 2026-03-22 22:02:31 +00:00
Hayden Redacted 77b42db2df Introduces an NGCR/Supermatter Submap to Boxstation (#31587) 
* Introduces an NGCR/Supermatter Submap to Boxstation

* linter fix

* linter fix pt. 2
 2026-03-18 05:54:52 +00:00
Alan 2b680e4eb0 Add pool noodles. (#31664) 
* Add pool noodles.

* Apply suggestions from code review

These are proper pool noodles now.

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

* Add hit sound. Allow zero-damage hit sounds.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-03-13 19:33:54 +00:00
Hayden Redacted d4aac8c0b5 Adds the Ability to Weld Crates Down for Metal (#31633) 
* initial commit

* Update code/game/objects/structures/crates_lockers/crates.dm

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

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-03-10 21:55:03 +00:00
PollardTheDragon ba514e2c08 Makes arrivals shuttles indestructible (#31600) 
* Makes arrivals shuttles indestructable

* Oops

* Oops
 2026-03-04 00:18:34 +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
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
Hayden Redacted 8debdb34e8 initial commit (#31678) 2026-02-27 19:38:49 +00:00
Alan e0a22b158f Add beach chairs. (#31665) 
* Add beach chairs.

* Add beach chair color variants. Update overlays.

* Thanks, linters!

* Add hit sound.

* Thanks, linters!
 2026-02-27 19:09:01 +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
Alan db9492f9b8 Add beach shells. (#31673) 
* Add beach shells.

* Improve shell icons and palettes.
 2026-02-27 19:06:24 +00:00
DGamerL fd739ce146 Refactor explosion() (#31358) 
* Refactor explosions

* Small change

* Final refactors

* A

* Helps for a very minor amount

* I'm silly

* Contra review

* Bring back this refactor

* Emerallddddd
 2026-02-17 19:20:12 +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
Toastical d516dc50a4 fix rcl being unable to wire machinery and mobs (#31646) 
* fix rcl being unable to wire machinery and mobs

* Update code/game/objects/items/RCL.dm

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

---------

Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-02-16 22:51:21 +00:00
BiancaWilkson 2ec0d8b685 windows arent instant build anymore (#31540) 2026-02-13 16:22:01 +00:00
Alan 9007b47eae Add new light replacer icons for janibelt and janitorial cart. (#31636) 
* Add new light replacer icons for janibelt and janitorial cart.

* Restore abductor crowbar belt sprite.
 2026-02-13 16:15:22 +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
Alan f31893cb9e Add re-wrappable, dyeable headscarves. (#31426) 
* 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

* Add re-wrappable, dyeable headscarves.

* Add trailing newlines. Correctly set worn_as.

* Include DME.

* Fix relatively defined path.

* Update heretic_necks.dm

* Update heretic_armor.dm

* Fix duplicate attack chain var. Thanks, linters!

---------

Co-authored-by: Fordoxia <Thrash97@googlemail.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-02-11 22:39:58 +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
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