cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-25 23:34:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
62,912 Commits 9 Branches 2 Tags
ffd9f7e2c57736243ff69012fed9ffc0571dcdfa
Commit Graph

29265 Commits

Author SHA1 Message Date
PollardTheDragon ffd9f7e2c5 Fixes smith knives not being able to embed (#31230) 2025-12-10 13:30:22 +00:00
Alan a2557daaa4 Add bubble tea flavor overlays. (#31182) 
* Add bubble tea flavor overlays.

* Thanks, linters!

* Apply suggestions from review.

* Fix duplicated reagent color; Thanks linters.

* Remove identical reagent color. Again.

* Apply suggestion from review.
 2025-12-10 00:07:45 +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
warriorstar-orion be48d7598f wire up ai idling to spatial grid (#30711) 
* wire up ai idling to spatial grid

* lint

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* stupid loadbearing src

* some spatial grid cleanup

* make sure to remove controllers in the GLOB

* immediately set targets and state for hiveloord brood

* properly fail behaviors when movement targets are lost

* Apply suggestions from code review

Comment formatting

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

* Update code/datums/ai/ai_controller.dm

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

* Update code/datums/ai/ai_controller.dm

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

* Apply suggestions from code review

Comment formatting

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

* Update code/datums/ai/ai_controller.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-09 23:46:38 +00:00
PollardTheDragon 2112de6067 Fixes credits (#31210) 2025-12-09 19:57:31 +00:00
AmityBlamity a5ae57bfdf Default cook surface temperature tweak (#31216) 
* Changed default cooking temperature from Low to Medium

* Fixed ice cream mixer and deep fryer breaking due to default temp change
 2025-12-09 19:56:49 +00:00
Christer2222 dacc72b732 Fixes a runtime with big explosions and disposal units (#31213) 
* fixed it

* update to modern naming scheme

* isnull
 2025-12-09 14:55:28 +00:00
Alan 924e512840 Fix painful vehicles for legless riders (janicart and bike) (#31195) 
* Change vehicle behavior for legless riders
- Make janicart unbucklable without legs
- Make bike unmovable without legs, but not painful, and pullable by other parties

* Thanks, linters!

* Apply suggestions from review.
 2025-12-09 08:10:24 +00:00
warriorstar-orion a4572e0aed put mining vendor item descriptions in tooltips (#31131) 
* put mining vendor item descriptions in tooltips

* add description to icon view as well
 2025-12-09 04:09:42 +00:00
warriorstar-orion e971ee0735 add machine repair kits to mining/explorer vendors (#31147) 
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-09 03:41:41 +00:00
Pooble a265e732d0 make ipcs clang and spark when hit (#31156) 2025-12-09 02:37:34 +00:00
DGamerL 4eede2e938 Untested goodness (#31153) 2025-12-09 02:35:52 +00:00
Alan 81587e2f8b Adjust soft caps, bio hoods, flower crowns, and more to fit monitor heads. (#31173) 2025-12-09 00:05:12 +00:00
Alan 445f0ea8dd Make *flip keep better track of who's buckled. (#31194) 2025-12-08 23:55:17 +00:00
PollardTheDragon c0ae9560e9 Fixes skeleton reanimators spawning in xenobio (#31209) 2025-12-08 23:54:03 +00:00
Alan 439b610530 Replace captain's garment bag with CapDrobe (captain's dresser-wardrobe). (#30885) 
* Replace captain's garment bag with CapDrobe.

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

* Fix small map error.

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

* Notify silicons of items they remove from wardrobes.

* Apply recommendations from review.
 2025-12-08 22:00:52 +00:00
BiancaWilkson 04fd8b2057 Cronchy (#31098) 2025-12-08 21:39:18 +00:00
Hayden Redacted d0c0dae20c Buffs the Radiation Armory of the Canary MODsuit (#31118) 2025-12-08 21:38:51 +00:00
PollardTheDragon 5d4a01148e Smithing Expansion: Knives and Mothsilk (#31084) 
* Smith Knives Initial Commit

* sprites and handling

* Knife stuff, mothsilk

* Touch ups

* Linters

* Apply suggestions from code review

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

* Abstract type desc

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-08 21:34:30 +00:00
Bm0n bba4438f64 Ports bluescreen fixes to player.ts (#31003) 
* the fix

* what is a span anyways

* i hate tgui

* tgui again

* prettier

* adds spanclass

* tgui build

---------

Co-authored-by: Bmon <no@email.com>
 2025-12-06 22:53:21 +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
Christer2222 d87d280b74 Targeting either hands on help intent now requests a handshake (#30927) 
* handshake

* removed unused comment

* linting

* formatting
 2025-12-05 22:12:28 +00:00
Alan 2ed573ded6 Hint digital valve direction when closed/off. (#31127) 2025-12-05 07:54:51 +00:00
1080pCat de917d0dc0 bsh rad pulse changes (#31103) 2025-12-05 07:53:58 +00:00
BiancaWilkson e6a39b2c6e Flap 2.0 (#31128) 2025-12-05 07:44:51 +00:00
Pooble f35b10850a infil and protect mutual exclusivity (#31133) 2025-12-05 07:43:58 +00:00
Alan 547d33a68b Resprite manual valves. (#31140) 2025-12-05 07:43:10 +00:00
Alan 158000c8fa Change reagent color of syndicate bomb. (#31187) 2025-12-04 21:48:26 +00:00
Alan 118e76f7ea Change beverage colors in code to match sprites. (#31181) 2025-12-04 19:54:24 +00:00
warriorstar-orion 6427827123 add food icons to cookbook pda app (#31139) 2025-12-04 15:59:52 +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
Ahzpy 9ef057533b Resprites some High Value Items (#30956) 
* defibs and lasers

* linters

* design

* fix missing sprites
 2025-12-04 09:12:30 +00:00
Toastical 6a9453f367 add poisoned apples as an apple mutation (#31115) 2025-12-03 20:21:35 +00:00
Alan c7ac9f1037 Add soft drinks to bar secondary goals. (#31100) 
* Add soft drinks to bar secondary goals.

* Thanks, linters!

* Update bar manual to reflect that procurement will accept soft drinks.

* Add drink difficulties to synthetic soft drinks.
Amend bar manual.

* Thanks, linters!
 2025-12-03 18:31:30 +00:00
1080pCat 2f030bd8e7 you cant outrun a radio (#31122) 2025-12-03 17:39:57 +00:00
Pooble 2ac3fb2b3e Add two new IPC implants, an EMP resist and a Defensive implant (#30911) 
* add two new IPC implants

* make EMP resisted IPCs take less body damage but more organ damage

* oops
 2025-12-03 17:38:26 +00:00
Alan 101af16180 Adjust monitor headwear, featuring cowboy hats. (#31066) 2025-12-03 16:58:02 +00:00
Hayden Redacted 79a891fd6d Remaps the Toxins Area on Deltastation and Adds an Empty Portable Air Pump Variant (#31000) 
* finishes the remap and adds a portable air pump that starts empty

* inheritance moment

* linter fixes

* addresses komrad's comment and moves the pipe adapters to be hidden
 2025-12-03 16:04:13 +00:00
PollardTheDragon 17f8f0d5a0 Ports End of Round Credits (#30778) 
* Proof of Concept

* Dead counter

* Finishing touches

* Lints

* Lint

* Hides sneaky admins

* I promise to englishes gooders

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

* Addresses code reviews

* No more lazy list

* Addresses code review

* Length

* Apply suggestions from code review

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

* Global List

* Address code review

* Apply suggestions from code review

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: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-03 15:30:20 +00:00
PollardTheDragon 8398a58002 Swarmers Round 2: Disintegration Boogaloo (#31089) 
* Initial Commit

* Small fixes

* Some Linters

* Beginning AI subtrees

* Blacklists

* SwarmerEventHandler

* Better swarmer disintegration AI

* Retaliate

* SWARMERS

* Forgot one

* Linters

* More linters

* Fixes missing icon

* Step type

* Comment format

* Fixes swarmer AI subtree

* Removes damage on teleporting humanoids

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Swarmers new event system

* Projectile changes

* Spacing fix

* Dispenser fix

* No more wood

* Adjustments

* Another adjustment

* Safety

* EMP Fix

* Fixes swarmers spacing shit

* Addresses code review

* Apply suggestions from code review

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

* Addresses code review

* Guard clause and index fix

* Fixes swarmers bunching up on the same object, fixes eating indestructable things

* New swarmer icons, multiple swarmer AI fixes and enhancements

* Linter

* Grrr linters

* Update code/modules/mob/living/basic/hostile/swarmers/swarmer.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Sprite Improvements

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: XFirebirdX <142694283+XFirebirdX@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-03 08:12:41 +00:00
Alan b967268c90 Prevent base type citrus in chef fridge. (#31170) 
* Prevent base type citrus in chef fridge.

* ... And make sure limes pass linters.
 2025-12-02 18:57:40 +00:00
Alan dbd2101d34 Fix missing icon for tapioca pearls in drinking glass. (#31169) 2025-12-02 09:49:45 +00:00
funglios8s 6a6f81131e Adds Tapioca and Cassava plants (#30937) 
* dat

* Fixes a few issues and makes the pudding look good

* fixes all sprites with hope

* actually should fix the sprites

* fixes cassava sprites and dough recipe oversight

* fixes tabbing issues and prevents botany gaming

* makes the linter happier + deletes duplicate file

* changes many things about the order

* generalizes the food reagentcontainer + linter gud

* fixes the merge conflict

* removes the settings on my vs code from my pr

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* Adds suggested changes

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

* adds an abstract description

* fixes an accidental deletion of vscodesettings

* Update code/modules/reagents/reagent_containers/food.dm

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

* adds a missing typepath

* Apply suggestions from code review

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

* Propose 2 tapioca pudding sprites.

* removes unused tapioca pudding sprite

* fixes my paradise.dme file

* Add new teas to the bar manual.

* adds alfalfa scout's recommended mix message

* attempts a fix for the .dme file

* removes a deconflicter mistake

* Apply suggestions from code review

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

---------

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
 2025-12-01 19:12:50 +00:00
Toastical a1fc8db55f standardize temperature_expose args (#30903) 
* standardize temperature_expose args

* some i missed

* remove dubious use of temperature_expose()

* fix hardsuit tank insertion proc

* remove unused gas_mixture arg

* revert test_tiny.dmm
 2025-12-01 18:58:38 +00:00
Ahzpy d5a758c727 Update telecomns.dm (#31081) 2025-12-01 17:04:43 +00:00
chuga-git 026bb3e859 tails stop wagging when putting on a suit that hides them (#31158) 2025-12-01 17:03:16 +00:00
DGamerL d518b81ada Why does Kudzu do this (#31163) 2025-12-01 13:39:37 +00:00
PollardTheDragon 727a42321e Adjusts damage mod on PKShotgun and PKRepeater (#31138) 
* Adjusts damage mod on PKShotgun and PKRepeater

* Rounding
 2025-11-30 22:08:20 +00:00
PollardTheDragon b6ea6d5cc0 Fixes new PKA guns having no inhand sprite (#31097) 2025-11-30 22:08:03 +00:00
CRUNCH 9a21d7363c Updates Mineral Doors (#31071) 
* door

* Update mineral_doors.dm

* Update test_attack_chain_structures.dmm

* Update rocky_motel_submap.dmm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-30 09:49:05 +00:00