cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,880 Commits 29 Branches 2 Tags
d87d280b749298c1942a49bf4c8cba446ba998a0
Commit Graph

46754 Commits

Author SHA1 Message Date
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
Hayden Redacted
f4adee5f3a Fixes a Typo in the Reagent Scanner (#31178) 2025-12-04 23:54:27 +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
Toastical
4506011bbf add an argument that toggles spammability of use_tool() (#30962) 
* add an argument that toggles spammability of use_tool()

* make argument more specific
 2025-12-03 16:12:10 +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
Alan
99fad46e39 Prevent non-adjacent mobs from spinning the roulette. (#31161) 2025-12-01 14:07:55 +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
CRUNCH
425d9313fa Update kitchen.dm (#31073) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-30 09:48:40 +00:00
Toastical
5ec6bc6eac adds dark flash toggle (#30945) 
* add dark flash toggle

* check for client

* remove string shenanigans, makes the dark flash path a var

* rename type argument to something that doesn't belong in an asylum
 2025-11-30 09:41:31 +00:00
DGamerL
dfb3337b1d Makes AA also give station engineer access (#31152) 
* Oops

* Also this
 2025-11-30 09:33:14 +00:00
Arthri
4f7a03e257 Fix ChemMaster custom input (#31069) 
* Move chem_master to tgui inputs

* Fix state bug in ComplexModal

* Build /tg/ui

* Remove isgoodnumber

* rerun CI

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
 2025-11-30 02:46:56 +00:00
warriorstar-orion
1a6b72937e make chicken noodle soup require chicken (#31107) 2025-11-29 20:16:48 +00:00
Kenionatus
c1bb25bae7 sets rubberducky throwforce to 0 (#31090) 2025-11-29 20:15:27 +00:00
CRUNCH
37ff6116c3 Update inflatable.dm (#31070) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-29 20:13:09 +00:00
Hayden Redacted
b0f2dbaf23 Adds the Temperature Gate (#30812) 
* introducing, the temperature gate!

* why is are the icons not workinggg, perhaps CI to the rescue

* rebuilding tgui

* tgui fix!

* icon fixes and tgui

* if i had a nickel for everytime i got told to rebuild tgui

* as funny as "the temperature thing" is, it should have a proper description

* T0C rounded to 273

* small typo

* some small sprite work
 2025-11-28 16:36:47 +00:00
warriorstar-orion
8082d847c6 fix carrot fries recipe failing (#31116) 2025-11-28 11:02:34 +00:00
Ahzpy
8ad4bcf906 Fixes tailwag stopping on external wear update (#31086) 
* yaya fixsies

* lets not restrict it to modsuits

* Update code/modules/mob/living/carbon/human/human_update_icons.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-11-28 11:01:40 +00:00
Hayden Redacted
0e8a6d0267 Fixes a Typo When You Deconstruct with an RCD (#31130) 2025-11-28 09:39:48 +00:00
Pooble
663339986d IPC arm implant no longer overridden by cybernetic revolution (#31044) 
* makes cybernetic implant not overwrite arm implant

* fix for case of no arms
 2025-11-28 04:08:09 +00:00
Pooble
316516b373 Makes alien organ extractor not kill IPCs when replacing their microbattery (#31065) 
* makes alien organ extractor not kill IPCs when replacing microbattery

* change to bool
 2025-11-28 04:07:05 +00:00
Pooble
96d0025aad IPCs keep their ID and pocket items when removing their jumpsuit (#31059) 
* ipcs don't drop their pocket items when jumpsuit is removed

* ipcs don't drop their pocket items when jumpsuit is removed

* linter
 2025-11-28 04:06:32 +00:00
CRUNCH
b2f2aa4392 Buffs Magnitis (#31040) 
* Update magnitis.dm

* Update magnitis.dm

* Update magnitis.dm

* Update magnitis.dm

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update magnitis.dm

* Update magnitis.dm

* Update magnitis.dm

* Update magnitis.dm

* Update magnitis.dm

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-11-28 03:52:13 +00:00
Christer2222
d4a435f740 You can now color boxes using crayons (#30977) 
* Americanized spelling

* more spelling

* spelling + alt click

* recoloring box, put it in hand and in bag

* in backpack now

* remove old comments

* updates inventory if backpack is open

* place in bags even on floor

* null check + checks actual type

* added the color tables

* added empty subtypes. Fixed movign away bug

* lint

* mapload + as mob removal

* early returning

* removed type checks. Added more checks for coloring

* added a description + early return on color tables

* lint

* documentation, formatting, HAS_TRAIT

* formatting
 2025-11-28 03:51:46 +00:00
Hayden Redacted
88dd66f076 Shifts the Offset of an APC on the Althland Facilities and Adds an Unbuilt APC Subtype (#30774) 
* shifts the offset of an APC on the Althland facility

* adds a new unbuitl APC frame and adds them to the althland facilities

* linter fix
 2025-11-27 10:00:19 +00:00
Alan
80453f856d Fix windoor autoclosing when valid mobs stand among dead mobs. (#31077) 
* Fix windoor autoclosing when valid mobs stand among dead mobs.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-27 09:49:42 +00:00