cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 00:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
24143 Commits
Author SHA1 Message Date
Christer2222andGitHub 9e87289bd8 Makes the Long-Distance Cloning Machine indestructible (#31212) 
* added the tag

* more immunities
 2025-12-09 19:57:34 +00:00
CRUNCHGitHubPollardTheDragonFordoxia
 		49a4a727cb Refactors Fence Code (#30931) 
* Update fence.dm

* Update fence.dm

* Update fence.dm

* Update fence.dm

* Update fence.dm

* Update fence.dm

* Update fence.dm

* Update code/game/objects/structures/fence.dm

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

* Update fence.dm

* Update fence.dm

* Update fence.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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-09 02:50:53 +00:00
DGamerLandGitHub 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
AlanandGitHub 1a78791087 Update buckled mobs' glide size even if atom's is unchanged (#31191) 2025-12-09 02:38:44 +00:00
AlanandGitHub 14badb5f4a Fix wheelchair mob layering. (#31193) 2025-12-09 00:05:36 +00:00
ToasticalandGitHub 96e617b4b9 add missing usr argument to tgui window in VV delete all (#31200) 2025-12-08 23:55:38 +00:00
AlanandGitHub 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
ToasticalandGitHub 85a26c00e2 Remove cargo bay and supply shuttle access from explorers (#31074) 2025-12-08 21:40:57 +00:00
PollardTheDragonGitHubDGamerL
 		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
PollardTheDragonGitHubDGamerL
 		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
Hayden RedactedandGitHub f4adee5f3a Fixes a Typo in the Reagent Scanner (#31178) 2025-12-04 23:54:27 +00:00
AhzpyGitHubDGamerL
 		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
AlanandGitHub 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
PoobleandGitHub 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
AlanandGitHub 101af16180 Adjust monitor headwear, featuring cowboy hats. (#31066) 2025-12-03 16:58:02 +00:00
ToasticalandGitHub 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
funglios8sGitHubDGamerLPollardTheDragonAlfalfa Scout
 		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
ToasticalandGitHub 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
AlanandGitHub 99fad46e39 Prevent non-adjacent mobs from spinning the roulette. (#31161) 2025-12-01 14:07:55 +00:00
CRUNCHGitHubFordoxia
 		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
CRUNCHGitHubFordoxia
 		425d9313fa Update kitchen.dm (#31073) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-30 09:48:40 +00:00
DGamerLandGitHub dfb3337b1d Makes AA also give station engineer access (#31152) 
* Oops

* Also this
 2025-11-30 09:33:14 +00:00
KenionatusandGitHub c1bb25bae7 sets rubberducky throwforce to 0 (#31090) 2025-11-29 20:15:27 +00:00
CRUNCHGitHubFordoxia
 		37ff6116c3 Update inflatable.dm (#31070) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-29 20:13:09 +00:00
Hayden RedactedandGitHub 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
Hayden RedactedandGitHub 0e8a6d0267 Fixes a Typo When You Deconstruct with an RCD (#31130) 2025-11-28 09:39:48 +00:00
Christer2222andGitHub 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
AlanGitHubDGamerL
 		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
PoobleandGitHub 8dfe842574 tweak infiltrate wording (#31042) 2025-11-27 09:47:53 +00:00
AlanandGitHub b29d968148 Add 23 new drinks; update bar manual. (#31026) 
* Add 23 new drinks; update bar manual.
- Add three new drinks that use the beet shrub and their effects
- Add nine new synthanolic drinks and their effects
- Add two new soft drinks for both synthetic and organic customers, and their effects
- Add 10 new soft drinks for synthetic customers and their effects
- Add decals for reagent splashes and drips
- Update bar manual to include these drinks as well as all other mixed drinks currently on the wiki
- Add new sprite for welding fuel in a glass to reflect the liquid's color instead of Dr. Gibb
- Add chemistry recipes to mix electrolytes
- Change Robot Tears' drink difficulty to easy, to reflect the loss of ubiquitous oil tanks
- Add many, many puns, both visual and in written text

* Thanks, linters!

* Thanks, linters! (part 2)

* Thanks, linters! (part 3)

* Incorporate review suggestions.
- Add reagents to the zero day drips
- Rewrite many if statements to be early returns/continues
- Use nutrition defines
- Make hard and soft reset also purge themselves (my choice)

* Update dryer martini sprite to match proposal #31050

* Incorporate review suggestions.
- Remove reagents, weren't needed.
- Make sure basecolor is applied.
- Convert more if-blocks to early returns.
- Adjust spacing in function calls to match standard.

* Implement whitespace suggestions from review.
 2025-11-26 21:24:06 +00:00
AlanandGitHub 07074ec6fe Proof of concept/proposal: Add page-seeking URL capability to books. (#31007) 
* Add page-seeking URL capability to books; Update bar manual.

* Capitalize all instances of 'back to Table of Contents'
 2025-11-25 21:25:24 +00:00
PollardTheDragonGitHubBurzah
 		0cfe0594be Refactors slaughter, shadow, and pulse demons to basic mobs (#30660) 
* Refactors slaughter, shadow, and pulse demons to basic mobs

* Linters

* Fix

* Projectile changes

* Ensures demons speak common

* Update code/modules/mob/living/basic/hostile/demons/demon_powers.dm

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-11-25 19:47:12 +00:00
ToasticalandGitHub b38b0203bc Fix mech crusher and mining bombs not working on basic mobs (#31085) 2025-11-25 14:23:49 +00:00
Seren Highwater.andGitHub dc88571fce Adds cargo pants to clothing vendor and loadout. (#31017) 
* done

* done2

* fix config oopsies

* greynvoxfix
 2025-11-23 06:27:58 +00:00
CRUNCHGitHubFordoxia
 		0b1b8866fc The Service Borg RSF Can Put Stuff in People's Hands (#30974) 
* Update RSF.dm

* Update RSF.dm

* Update RSF.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-23 03:05:34 +00:00
CRUNCHGitHubJimKil3Fordoxia
 		4dd9b3f0d5 Allows inflatable barriers to be printed. (#30970) 
* Update autolathe_designs.dm

* Update code/modules/research/designs/autolathe_designs.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* commit inflation

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2025-11-23 03:03:57 +00:00
DGamerLandGitHub d4b738bfe6 Makes infiltrate sec and destroy AI hidden delayed objectives (#30969) 
* Untested greatness

* Update code/game/gamemodes/objective.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-23 03:03:35 +00:00
CRUNCHGitHubFordoxia
 		9c92917dd2 Gives the Janiborg a Push Broom (and allows the janiborg combat broom to sweep) (#30820) 
* BROOOOOOM!

* Update robot_items.dm

* Update robot_items.dm

* Update robot_items.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-22 22:18:53 +00:00
AhzpyGitHubDGamerL
 		2008eafa40 Adds a do_after when unbuckling people from wheelchairs (#31025) 
* anti bullying mechanism

* fix code sin

* Update code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

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-11-22 19:43:30 +00:00
PollardTheDragonandGitHub 0122cbb797 Tweaks mob mech damage, makes basic mobs handle mechs consistently. (#30842) 
* Tweaks mob mech damage, makes basic mobs handle mechs consistently.

* Extraneeous else
 2025-11-22 19:43:01 +00:00
PoobleandGitHub 9728a792fe Tweak Incriminate objective wording (#31043) 
* tweak incriminate wording

* missed the delayed text
 2025-11-21 02:30:24 +00:00
MixityMaxityandGitHub cc115b8be8 Makes the Large Tank Controller name consistent (#31001) 
* Renames the built computer to "large tank control"

* Renames the actual circuit to "large tank control"
 2025-11-20 10:38:44 +00:00
ChapGitHubkyunkyunkyunadrermail@gmail.com <adrermail@gmail.com>
 		d3c7c82372 [FIX/SPRITES] Fixes a bunch of in-hand weapon sprites (#31023) 
* Fix a bunch of in-hand weapon sprites

* Correct chainsaw names

* Readd KC sprites

* Remove empty state

* Spellblade and darkblade

* Spellblade fixed

* Chainsaw fixes

* Darkblade renamed

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

Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
 2025-11-17 19:18:45 +00:00
AhzpyandGitHub b7a1dffb78 ID Card Resprite + Job Hud Resprite (#30936) 
* cards and huds

* tsf ids

* fix contrast on pink, yellow, and paramedic IDs, new engineering icon

* test tube scientists
 2025-11-17 18:33:12 +00:00
iramoyeandGitHub 52bd18a1a0 i can't believe i missed this (#30932) 2025-11-17 18:31:28 +00:00
1080pCatandGitHub 0012d870dc Reverts the HP of grilles back to their pre-buff state, but makes meteors take more damage from them (#30918) 
* Update grille.dm

* fully back
 2025-11-17 18:30:08 +00:00
CRUNCHGitHubPollardTheDragonFordoxia
 		357a772b6f Converts the Gamma Armoury Into a REAL Shuttle + Extra Gamma Armoury Content (#30847) 
* Thank god it's actually a real shuttle now

I hate the gamma armoury so much.

* Update shuttle.dm

* preset docking ports woo

* named ports

* Update shuttle.dm

* lateload woo!

* god

* Update misc_admin_procs.dm

* Update SSshuttles.dm

* Update misc_admin_procs.dm

* Apply suggestions from code review

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-11-17 18:26:07 +00:00
CRUNCHGitHubFordoxia
 		082b5283ad Update rpd.dm (#30973) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-16 11:52:42 +00:00
PollardTheDragonGitHubDGamerL
 		c6875a50d0 Converts spiderlings to basic mobs (#30571) 
* Converts spiderlings to basic mobs

* Address code reviews, add terror_spiderlings to isterrorspider()

* Update code/modules/mob/living/basic/hostile/spiderlings.dm

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

* Update code/modules/mob/living/basic/hostile/spiderlings.dm

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

* Breaks up ancient spiderling life into something more modern

* Fixed the brimming station of spiders

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-15 23:36:15 +00:00
CRUNCHGitHubFordoxia
 		0ce4bb4144 Filled Mop Buckets now Spawn With a Mop Inside (#30892) 
* mop

* update icon

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-13 23:50:41 +00:00