cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,834 Commits 13 Branches 2 Tags
master
Commit Graph
4952 Commits
Author SHA1 Message Date
AlanandGitHub c93a6d9c2a Migrate thurible to the new attack chain. (#32416) 
* Migrate thurible to the new attack chain.

* Add fingerprints.
 2026-08-23 15:09:22 +00:00
AlanandGitHub 2b0638def8 Fix storing several recently-migrated items. (#32383) 
* Fix storing light replacers, handheld defibs.

* Apply suggestion from CRUNCH review.

* Fix similar mishap in body analyzer, flash, gas analyzer, laser pointer, garrote, evidence bag, and organ extractor.
 2026-08-12 23:48:38 +00:00
AlanandGitHub fe10790ad1 Fix explorer webbing weight class. (#32367) 2026-08-12 23:48:11 +00:00
AlanGitHubCRUNCH
 		6a83c1ad67 Migrate two-handed weapons to the new attack chain. (#32313) 
* Migrate two-handed weapons to the new attack chain.

* Apply suggestions from CRUNCH review.

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

* Separate two-handed weapons into several files in their own folder.

* Formatting tweaks.

* Apply suggestions from CRUNCH review.

* Include paradise.dme.

* Migrate a bit more, clean up a bit more.

* Apply suggestions from CRUNCH review.

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

* Apply suggestions from CRUNCH review

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

* Hopefully resolve CRLF error.

* Define some variables.

* Apply suggestions from CRUNCH review.

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

* Apply suggestions from CRUNCH review.

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

* Apply suggestions from CRUNCH review

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

* Fix supermatter halberd dusting condition, spelling errors.

* Apply suggestion from CRUNCH review.

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

* GITHUB NO. PUT THAT BACK.

* Fix pyro claws door force.

* Restore the coveted trailing newline.

* Apply suggestion from CRUNCH review.

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

* Migrate bo staff to the two handed folder and new attack chain.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-08-12 23:23:39 +00:00
AlanGitHubCRUNCH
 		bf5101f6ac Migrate holosign projectors to the new attack chain. (#32278) 
* Migrate holosign projectors to the new attack chain.

* Apply suggestions from CRUNCH review

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

* Move sign creation (and timer starting) to helper proc.

* Allow placing in storage.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-08-12 23:19:58 +00:00
AlanGitHubCRUNCH
 		2d22c7faec Migrate scissors to the new attack chain. (#32279) 
* Migrate scissors to the new attack chain.

* Add fingerprint.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-08-01 06:11:08 +00:00
AlanGitHubCRUNCH
 		fab78d2957 Migrate gifts to the new attack chain and to the same file. (#32276) 
* Migrate gifts to the new attack chain and the same file.

* Make wrapped gifts a small_delivery subtype.

* Remove duplicate vars.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-08-01 06:10:02 +00:00
AlanGitHubCRUNCH
 		fa6d060bf8 Migrate transfer valve, assembly holder, and chem grenade to the new attack chain. (#32262) 
* Add transfer valve to the new attack chain.

* Apply suggestions from CRUNCH review

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

* Update assembly messages, migrate assembly holder and chem grenade.

* Fix onetankbomb gas analysis.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:40:24 +00:00
AlanandGitHub 3d0a47c4ce Migrate dice and hammer to the new attack chain. (#32272) 2026-07-24 19:39:03 +00:00
AlanGitHubCRUNCH
 		664b717402 Migrate bee briefcase to the new attack chain. (#32294) 
* Migrate bee briefcase to the new attack chain.

* Add fingerprints.

* Apply suggestions from CRUNCH review

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

* Use cooldown macros.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:31:28 +00:00
AlanGitHubCRUNCH
 		a263a81774 Migrate whetstone to the new attack chain. (#32288) 
* Migrate whetstone to the new attack chain.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:30:45 +00:00
AlanGitHubCRUNCH
 		c31b38eff9 Migrate glass shards to the new attack chain. (#32287) 
* Migrate glass shards to the new attack chain.

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:30:27 +00:00
AlanGitHubCRUNCH
 		baf934b981 Migrate miscellaneous weapons to the new attack chain. (#32284) 
* Migrate miscellaneous weapons to the new attack chain.

* Add fingerprints.

* Call parent in lightning's after_attack()

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:30:15 +00:00
AlanGitHubCRUNCH
 		f9c601b7be Migrate knuckleduster and kitchen tools to the new attack chain. (#32283) 
* Migrate knuckleduster and kitchen tools to the new attack chain.

* Add fingerprints.

* Remove duplicate vars.

* Apply suggestions from CRUNCH review

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

* Fix number of macro arguments.

* Give organs a source.

* Call parent in knuckledusters' after_attack()

* Apply suggestion from CRUNCH review.

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

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:30:00 +00:00
AlanGitHubCRUNCH
 		4bfc230a72 Migrate flamethrower to the new attack chain. (#32275) 
* Migrate flamethrower to the new attack chain.

* Make flamethrower throw flame at range as intended.

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-24 19:29:27 +00:00
AlanandGitHub 76e97a55bb Migrate garrote to the new attack chain. (#32273) 
* Migrate garrote to the new attack chain.

* Add fingerprint.

* Call parent in attack().

* Change to interact with atom.
 2026-07-24 19:29:15 +00:00
AlanGitHubCRUNCH
 		3a9d3522b0 Migrate PAI data cable to the new attack chain. (#32213) 
* Migrate PAI data cable to the new attack chain.

* Include paradise.dme.

* Apply suggestions from CRUNCH review

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

* Apply suggestion from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-07-17 06:20:36 +00:00
PollardTheDragonGitHubKapu1178ToasticalBurzah
 		24845b238a The Divine Flock - DaedalusDock Flockmind Port (#31984) 
* Initial commit - FLOCKMIND - Probably has like a billion things to fix

* Do after conversions

* Config

* Moved the files, icon fixes

* Tick everything, language work, event, spawn landmark, role prefs, beginning mob port

* Spans and some other fixes. Also the tickening

* More tickening

* More fixes. Lots of fixes.

* More Fixes

* A whole lot more. Also flock TGUI.

* Fixes fixes fixes fixes fixes

* FIXES

* More fixes - PR ready, still needs a fuckton of testing

* Fixes

* fix incomplete upstream merge

* fix FlockPanel + sort button name

* TGUI review

* Fixes tealprint list

* Fixes

* More fixes

* Incapacitator Fix

* Filenames

* Linters

* Interceptor range buff

* Reagent counts

* Linters

* Fabricator vendor fix

* Keybinds and HUD - Flockdrones, Fixes Vendor Conversion, Cube Materials

* Reworks reagent, adds flock grilles, fixes compute node overlays

* Intent-based flockdrone parts

* Intent based drone parts

* Radial control panel for controlling drones manually, phasing through windows/grilles

* Movement fixes

* Radio talk power, stare fix

* Flock health HUD

* Fixes flock lights, linters

* Unit tests

* Adds countdown to relay

* Relay improvements

* Small fix

* Logic Schmogic

* Relay overlay and looping sound effect

* Ignore air when converting turfs

* Cage fixes and improvements

* Improved flock bolt

* Turret conversions

* Flock bolts taze simple or basic mobs

* Sentience type

* Fixe

* Linter

* tgui review stage 2

* Concentrated Repair Burst

* Improves radio detection

* Removes extra space

* Adds healing visual effect

* Cube tech levels

* Ghooost

* Excess

* Flock doors, chairs, lattices. Centralizes conversion code.  Crafting with Gnesis

* Update code/modules/antagonists/flockmind/ai_behaviors/flock_wander.dm

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

* Fixes the fix

* Astar movement detection

* Fix, extraneous code, language stuff

* Language fixes and wander fix

* Fixes

* Another fix

* Lints

* Another linter

* Language improvement

* More language improvements

* Time requirement and appearing in orbit menu as an antag

* Cube glow

* TGUI

* Minicache

* Linters

* Grammar

* Material ID fix

* Lid fix

* Reagent turf reaction

* Reagent fix

* Butcher results

* Conversion rates

* Flock stare fix

* Fixes stare behavior

* Staring

* Flock mob blood

* Flock mobs gibs and blood. Also some runtime fixes

* Flock mobs now resist out of grabs, buckles, lockers, and more

* Fixes flock orbit, fixes a runtime I think,

* Target mechs, damage mechs, other bug fixes

* Cage fix

* Cage resist change

* Some mind changes, gatecrash buff

* Drones now shoot mechs, stare improvement

* Cut down on spam a little

* Nest fix

* No more resist spam

* Fixed drone death control

* Resist statement

* Makes the relay alarm scarier

* Fixes dead flock camera mobs having no ghost sprite, something with ghosting

* Enhanced flockphasing

* Improved flockmob pathing

* Added required turf restriction to relay

* Increased needed bandwidth for relay construction

* Nerfed drone substrate rate

* Added new status tab items for relay progress

* Another relay cost adjustment

* Improves drone AI responsiveness

* Computer frames now become flock computers

* Improves target finding for conversion, building, and replicating

* Reduced flock event pop requirements

* Adjusts flock protection on structures. Adjusts overlays.

* Relay unlock tweak

* Fixwes flock being able to gib mech'd AIs with one button

* Map conflict

* Flock can no longer be outed by merely existing

* Fied bug causing drones to shoot themselves

* Prevents mobs from attacking while in a cage

* Converter tool can now open closets and crates.

* Adds descriptions to flockdrone tools.

* More informatic blurbs

* Adds xenobiology organs

* Organ lint

* TGUI merge

* bundle and mm

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2026-07-08 21:31:28 +00:00
PollardTheDragonandGitHub a909395bfc Adds suture and mesh packs (#32154) 
* Adds suture and mesh packs

* Fixes, unmedicated needles and mesh
 2026-07-07 23:48:47 +00:00
AlanandGitHub 99310edc81 Add light replacer to utility belt, tweak sprite. (#32152) 2026-07-07 23:46:22 +00:00
CRUNCHandGitHub e694ab9ebf Updates TSF Marine Loadouts (#32139) 
* marine gear

* Update outfit_admin.dm

* Update pda.dmi
 2026-07-01 23:24:16 +00:00
AlanGitHubPollardTheDragon
 		4c7e65d7b2 Allow simply putting soap/mop/rag in storage if clean. (#32092) 
* Allow simply putting soap/mop/rag in storage if clean.

* 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-07-01 23:13:20 +00:00
PollardTheDragonandGitHub 5a446efbec Adds 'Prospector' Mining Turrets (#32108) 
* Adds 'Prospector' Mining Turrets

* Linters
 2026-06-24 22:17:48 +00:00
PollardTheDragonandGitHub 8f654dfcc7 Adds Kidan Ship Ruin (#32081) 
* Kidan Warriors

* Linters

* Kidan mob AI adjustments and stat adjustments. Kidan Princess Megafauna

* Bug spray vulnerability

* Ragnarok props and kidan spear update

* The ship

* Fixes and adjustments

* Map update

* Linters
 2026-06-24 21:49:27 +00:00
AurouraPlaysGitHubAlan
 		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
AurouraPlaysandGitHub 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
AlanGitHubCRUNCH
 		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
PollardTheDragonGitHubJimKil3
 		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
AlanandGitHub 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
CRUNCHandGitHub 8fe4bf5ded blind cane craft (#31962) 2026-05-13 22:11:06 +00:00
PollardTheDragonGitHubJimKil3
 		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
AlanandGitHub b0a8b84dbf Add cardboard recycling. (#31937) 
* Add cardboard recycling.

* Add more cardboard items to the recycling list.
 2026-05-02 00:47:14 +00:00
AlanandGitHub 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
AlanandGitHub 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 RedactedGitHubDGamerLMiles
 		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
CRUNCHandGitHub 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
CRUNCHandGitHub 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
CRUNCHandGitHub 5047c35ed3 Adds Durkehiet, removes Howler (#31844) 2026-04-13 23:46:01 +00:00
CRUNCHGitHubiramoyeAhzpyPollardTheDragonFordoxiaAlfalfa Scout
 		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
PollardTheDragonandGitHub 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
CRUNCHandGitHub 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
PollardTheDragonandGitHub 01726c44b5 Adds logging for if a grenade is primed by damage received (#31761) 2026-04-03 20:24:31 +00:00
CRUNCHandGitHub 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
PollardTheDragonGitHubMiles
 		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
PollardTheDragonandGitHub 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
AlanGitHubFordoxia
 		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
MixityMaxityandGitHub 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
AlanandGitHub ae181bf265 Make fanny packs dyeable. (#31676) 2026-02-27 19:06:58 +00:00
Christer2222andGitHub 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
CRUNCHGitHubDGamerL
 		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