cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,806 Commits 14 Branches 2 Tags
master
Commit Graph
29713 Commits
Author SHA1 Message Date
CRUNCHGitHubDGamerL
 		ee228cdb6b Migrates restraints to the New Attack Chain (#31310) 
* e

* Update legcuffs.dm

* Update umbrae_powers.dm

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-26 10:50:42 +00:00
PollardTheDragonandGitHub b211866196 Nerfs knife availability (#31318) 2025-12-25 23:09:59 +00:00
CRUNCHandGitHub eeb980f191 Adds Reycleable Materials to a Bunch of Objects (#31320) 
* recycle

* moar

* Update glass_containers.dm

* Update spray.dm

* cost adjustment because sheets are 2000, not 1000

* Update hydroitemdefines.dm

* Update hydroitemdefines.dm
 2025-12-25 21:03:22 +00:00
warriorstar-orionandGitHub d45fe9cef4 use loaded cooking machines in station kitchens (#31304) 2025-12-25 20:59:16 +00:00
ToasticalandGitHub 4433f60e18 Make ruptured lung appear in the organ containing the lung (#31303) 2025-12-25 09:49:56 +00:00
iramoyeGitHubBurzah
 		58e641ed25 Reduces the healing power and cooldown of Quick Reboot (#31222) 
* adds the nerfs

* oopsies

* Update buffs.dm

Signed-off-by: iramoye <projecteternal1@gmail.com>

* Update flayer_buffs.dm

Don't use Discord as a medium to put your code. Just don't. Discord's codeblocks turn your tabs into spaces for some reason.

Signed-off-by: iramoye <projecteternal1@gmail.com>

* Update flayer_buffs.dm

Oops. The scaling didn't match the price. Ooooooops.

Signed-off-by: iramoye <projecteternal1@gmail.com>

* Update flayer_buffs.dm

I love math. Only when I've got a calculator, though.

Signed-off-by: iramoye <projecteternal1@gmail.com>

* this doesn't even do anything what was i thinking

---------

Signed-off-by: iramoye <projecteternal1@gmail.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-12-24 20:28:25 +00:00
Wenlock_The_British_HoboGitHubCRUNCHPollardTheDragonDGamerL
 		a3bb94b905 Cannibalism Update™️ (#31142) 
* dmi time

* .dmi stuff done, maybe

* Created cannibalism.dm and moved KFV's obj stuff.

* Update cannibalism.dm

* Wild Wings and Bug Bar

* A few more.

* Meow Mein

* Lead and Plasma-Bone Broth

* Multiple possible sprites.

* Last food item. Next recipes and the Bone Rod.

* Adding bone rod sprites and sprites for bone rod variants of food with metal rods in them

* Fix complaining of the compiler.

* Bone Rods

* Almost everything done.

* Bone Rods ticked.

* dme updated on compile.

* Forgor the BBQ variant of Moffolo Wings needed a unique path.

* Probably make Plasma-Bone Broth flammable like plasma sheets.

* Should light now, will test later.

* Some recipes, and processor.

* Processor was complaining, also changed a parameter to be readable.

* More bone rod.

* The rest of them.

* No more errors on compile.

* Recipes tested and things fixed.

* Lead works.

* Kidneys dead? Toxin.

* Soy Sauce in the Meow Mein.

* Working sprite RNG.

* Make Linters happy

* Apply suggestions from CRUNCH's code review to fix Plasma-Bone Broth's flame.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Make linters happy

* Updated bone rod description to be less vague.

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* More descriptive recipe names in code

* Replace Meow Mein sprites with Feline Mignon

I'll see about using the Meow Mein sprite for chef craftable Chow Mein, as the issue is with Meow Mein not the sprite.

* Change code from Meow Mein to Feline Mignon

* Don't need the blank recipe list in this PR.

* Update code/game/objects/items/stacks/bone_rods.dm

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

* Update code/game/objects/items/stacks/bone_rods.dm

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

---------

Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-24 20:21:36 +00:00
AlanandGitHub e7dc0c3cf5 Fix bandana colors after dyeing. Fix typo. (#31243) 
* Fix bandana colors after dyeing. Fix typo.

* Thanks, linters!
 2025-12-24 20:20:33 +00:00
warriorstar-orionandGitHub 6d9a04bdb9 several SSshuttles guardrails (#31238) 
* several SSshuttles guardrails

* move cast to loop
 2025-12-24 16:36:22 +00:00
AsmerathandGitHub afe1d8b35d Adds 5 new Hairstyles (#31203) 2025-12-24 15:44:53 +00:00
warriorstar-orionandGitHub 05108670a7 load the emergency shuttle in late mapping (#30854) 
* load the emergency shuttle in late mapping

* fix lints

* register the late loading docking port properly

* fix logging
 2025-12-24 15:42:46 +00:00
PoobleandGitHub e436df7051 Ghost Vision can hide your own ghost (#31211) 
* make it so you can hide your own ghost

* don't shift bitflags actually
 2025-12-24 15:41:53 +00:00
AlanandGitHub 7ebbd0c39f Check if Poly is alive before fleeing attack. (#31334) 2025-12-24 14:53:11 +00:00
ToasticalandGitHub 16d0b18953 fix round-end credits using the wrong toggles var (#31327) 2025-12-20 17:44:10 +00:00
CRUNCHandGitHub cf9d730b03 Update photocopier.dm (#31328) 2025-12-20 00:16:26 +00:00
PollardTheDragonandGitHub ef07d66eb7 Fixes smith knife names (#31315) 2025-12-19 13:24:05 +00:00
ToasticalandGitHub ff1f7c2556 fix slime blood not transfusing to vampires (#31314) 
* fix slime blood not transfusing to vampires

* fix non-vampire slime transfusion

* santa claus but it's a guard
 2025-12-19 13:23:36 +00:00
CRUNCHandGitHub d360ca18cc Fixes Chemthrower Fire Burning Mobs That Don't Care About Fire (#31316) 
* fire

* Update fire_effect.dm
 2025-12-19 13:10:59 +00:00
CRUNCHandGitHub 30243db95c Update photocopier.dm (#31321) 2025-12-19 11:28:48 +00:00
warriorstar-orionandGitHub 481f035722 Metastation kitchen area redesign and related features, take 2 (#30754) 
* Metastation kitchen area redesign and related features, take 2

* reviews
 2025-12-18 23:46:17 +00:00
Christer2222GitHubDGamerL
 		e2efb09016 Adds a display for job difficulty as well as a description of the job (#30960) 
* tip window, comments, padding, difficulty supervisor

* spacing

* shows missing stars

* dmi to base64

* defines

* assigned difficulty to each job

* added star sprites

* assistant fix

* show stars when assistant

* Fixed restrictions

* comment

* consistent size work preference

* tooltips now work, indented html

* inlined the tooltip script

* Moved buttons to top

* padding and margins

* align learn more button right

* css cleanup

* added descriptions. HTML encoding.

* cargo description expansion

* linting

* null check

* l

* 3 half stars

* lint

* miner difficulty 3->4

* spacing and removed old test comments

* spacing pt1

* spacing pt2

* string names of colors

* spacing

* rearranged defines

* span -> defines

* snake_case

* removed extra space

* Apply suggestions from code review

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

* Update code/modules/client/preference/character.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-18 23:09:07 +00:00
warriorstar-orionandGitHub 194de8e78d add ai controller debugger to context menu (#31301) 2025-12-18 18:18:06 +00:00
warriorstar-orionandGitHub c905f98f1d move shuttle loading to cordons (#31237) 
* move shuttle loading to cordons

* clean up our reservations after we move

* pull logs up to stack traces
 2025-12-18 14:55:56 +00:00
PollardTheDragonandGitHub fd63d61526 Fixes attaching bits to smithed knives (#31235) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-18 09:22:53 +00:00
CRUNCHandGitHub 6fc59844e9 Improvements to Borg Icon Handling (#31251) 
* e

* Update chameleonproj.dm

* death to custom panel

* Update robot_mob.dm

* Update robot_mob.dm
 2025-12-18 08:57:42 +00:00
AlanandGitHub 8a0e7203cf Fix supermatter sandwich checker when using tongs. (#31246) 2025-12-18 08:53:54 +00:00
ToasticalandGitHub 532fea62d4 remove repeated element add (#31299) 2025-12-17 18:06:35 +00:00
1080pCatandGitHub 4bb94b0924 Update migo.dm (#31286) 2025-12-16 08:54:29 +00:00
AlanandGitHub 9a30586488 Add a cooldown to Bubbly Beep's drink message. (#31228) 2025-12-16 07:56:08 +00:00
BiancaWilksonGitHubPollardTheDragonBurzah
 		59ef2c2663 Ports MMIs/Robobrains to New Attack Chain, Makes dead robobrains repairable (#31027) 
* Rejuvenating brains rejuvenates the brainmob

* Fixes EMP damage too

* alert the ghosts

* oh this suddenly became an attack chain refactor, huh

* More attack chain flags

* Adds guard clause

* Update code/modules/mob/living/brain/MMI.dm

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

* Update code/modules/mob/living/brain/MMI.dm

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

* Span define update

* missed one

---------

Signed-off-by: Burzah <116982774+Burzah@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-16 07:54:43 +00:00
ToasticalandGitHub 797a369324 Make legions run away from occupied mechs (#31083) 
* Make legions run away from occupied mechs

* remove unneeded return
 2025-12-15 19:04:38 +00:00
1080pCatandGitHub 0a0071ae21 Update telecomns.dm (#31275) 2025-12-15 17:07:22 +00:00
ContrabangandGitHub 1cd35e567c fixes staff missing control_freak access (#31263) 2025-12-15 16:38:49 +00:00
AlanandGitHub 1c7c6f6b74 Add mail to unwrappable objects. (#31264) 2025-12-15 16:22:31 +00:00
ToasticalGitHubDGamerL
 		9f0b25b431 Fix being able to point while dead (#31250) 
* stop pointing while dead

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

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-14 20:29:45 +00:00
PoobleandGitHub 2a28e04972 Adds a Santa hat and Santa suit item, and improves admin-only Santa's hat and Santa's suit. (#31172) 
* adds a crew santa hat and suit, improves the Santa's hat and Santa's suit

* fix santa hat flags

* address a PR comment AND the new span stuff at the same time, wowie zowie
 2025-12-14 16:32:13 +00:00
PollardTheDragonandGitHub e43e59d986 Fixes uncalled parent (#31180) 2025-12-14 15:56:00 +00:00
kyunkyunkyunandGitHub b0463d3c83 Convert most spans to defines (#31080) 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
 2025-12-13 23:55:48 +00:00
PollardTheDragonandGitHub e5f0a6fffb Fixes swarmeers cancelling their own reproduction (#31234) 2025-12-12 20:51:26 +00:00
leboucliervertandGitHub 969f8a3916 I hereby name thee.. Jumpsuit! (#31240) 2025-12-12 20:51:06 +00:00
CRUNCHandGitHub de8827811b Update robot_mob.dm (#31242) 2025-12-12 20:39:58 +00:00
ContrabangandGitHub ef7e48db9c Makes a ton of dirs into defines (#31244) 
* Makes a ton of dirs into defines

* lol oops

* "fix"

* ignore everything
 2025-12-12 20:32:33 +00:00
warriorstar-orionandGitHub 2a842644d5 port ADMIN_VERB and friends (#30646) 
* port ADMIN_VERB and friends

* some renaming

* dumb

* one more rename

* never search and replace this codebase

* fix TM issues, more renaming

* add a static analysis to shore up user verbs

* fix double message on roundstart

* remove macro we're not using yet

* convert remaining playsounds verbs

* convert more verbs i missed somehow

* why is this a completely different signature than everything else

* fix ui_interact arg

* fix logging view and others

* buncha issues caught in TM

* fix mentor tickets ui

* fix bug report viewing

* moron
 2025-12-12 19:18:22 +00:00
PollardTheDragonandGitHub f89b05ee88 Fixes credits causing round hangs (#31229) 
* Fixes credits causing round hangs

* Another fix
 2025-12-12 18:45:11 +00:00
CRUNCHandGitHub 4934ca5962 Silicon Hats are now Removed by Action Button (#31145) 
* Hats

* Update silicon_mob.dm
 2025-12-12 15:31:53 +00:00
Christer2222andGitHub bf79a0f35a Fixes shelter capsules being blocked by large rocks and not removing wall plants + attack chain (#31135) 
* attack chain + deletes rocks and plants

* comments

* lint

* casting

* as anything. Check return value
 2025-12-12 15:30:50 +00:00
AhzpyGitHubPollardTheDragon
 		bc64756eec Bandana Reshade + Color Edits (#31095) 
* bandana resprite, color, loadout

* Update code/modules/clothing/masks/misc_masks.dm

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

* Update code/modules/clothing/masks/misc_masks.dm

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

* Update code/modules/clothing/masks/misc_masks.dm

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

* Update code/modules/clothing/masks/misc_masks.dm

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

* Update code/modules/clothing/masks/misc_masks.dm

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

* Update code/modules/clothing/masks/misc_masks.dm

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

* so you can batch suggestions

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-12-12 15:26:15 +00:00
CRUNCHandGitHub 373287792a I Live Again: Cyborg Resprite, Act I (Part 2): The Second Part (#31155) 
* The glorious suffering and pain

* Update robot_parts.dmi

* Update robots.dmi
 2025-12-10 13:35:28 +00:00
PollardTheDragonandGitHub ffd9f7e2c5 Fixes smith knives not being able to embed (#31230) 2025-12-10 13:30:22 +00:00
AlanandGitHub 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