cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-28 02:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,019 Commits 28 Branches 2 Tags
b1c2651fe2977df0eebf7ecc5a99da96ae562d7b
Commit Graph

29329 Commits

Author SHA1 Message Date
Alan
8f87fa0b98 Add juice boxes. (#31331) 
* Add juice boxes.
- Include juice boxes in packed lunches quirk.
- Make juice names and drink names in drinks_reagents.dm more consistent.

* Appease linters with static typing?

* Add juice box box. It's a variety pack.

* Add trailing commas to positive quirks as requested.

* Add random juice box spawners.
- Spawn random and specified juice boxes on station maps.
- Spawn partial juice variety packs on station maps.

* Add juice box variety pack supply crate.

* Make juice box storage even fancier.

* Thanks, linters!

* Thanks, linters! part 2

* Give the pre-packaged juice boxes a brand name.

* Apply whitespace 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>
 2025-12-30 05:32:56 +00:00
CRUNCH
8519c59c7e Migrates Paper and Paper Bundles to the New Attack Chain (#31294) 
* w

* migrated

* Update paper_bundle.dm

* linters

* 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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-30 05:32:35 +00:00
kyunkyunkyun
8c68130b4c Update syndicate_mobs.dm (#31336) 2025-12-29 20:21:31 +00:00
Pooble
8e79d6c089 Adds configs for hijack population minimums (#31206) 
* add config for hijack pop lock

* woopsie daisy

* doth this please you, your lintliness?

* nerd emoji

* address DGL's most beauteous code review
 2025-12-29 13:49:45 +00:00
DGamerL
47f9d5a2ef Kidney overhaul (#31324) 
* The Kidneying

* Oculine
 2025-12-29 05:21:28 +00:00
Alan
d37f014ecc Adds SolGov winter coat. (#31335) 
* done

* oops

* vox fingers

* Update misc_suits.dm

* update icon vars in line with new sprite code

* Update SolGov winter coat to match others.

* Add SolGov winter coat object sprites.

---------

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-12-27 09:43:31 +00:00
PollardTheDragon
a590870d00 Monke Business - Ports monkey AI from TG (#31067) 
* Monke Mode

* Punch

* Some comment stuff

* Linters, excess

* Linters

* Emote stuff

* Pause monkey AI during do afters

* Small improvements

* Oops

* Fixes monkeys trying to drink forever from a glass

* Knockdowns and stamcrit fixes

* Removes eating/drinking from Pun Pun

* Monkey controller improvement, bug fix

* Fixes monkey item giving

* Fixes brain swaps

* Fixes

* Update code/datums/ai/monkey/monkey_controller.dm

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

* Addresses code review

* Oops

* Oops round 2

* Fixes monkeys staying in trip mode when evolved

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-12-26 22:44:52 +00:00
PollardTheDragon
82d31ab8a5 Enhances Swarmers (#31261) 
* Enhances Swarmers

* Burst delay
 2025-12-26 22:41:34 +00:00
DGamerL
a1e27c07da Turns some wounds into datumized versions (#31297) 
* Wound datumization

* Rejuv additions

* Fixes

* Adds `get_wound()` proc

* Ruptured lungs get fixed now

* Apply suggestions from code review

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

* Fix this

* Potentially fix an issue, might remove the proc later

* Many fixes

* Fuck

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-26 22:29:05 +00:00
PollardTheDragon
74d723496f Adds Paintball Guns (#31184) 
* Paintball Guns

* Linters and cleanbot

* Fixed examine text

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Fixes decals

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/toy.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Spans

* Clean code fix

* 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>

* Removes excess cut

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-26 22:12:03 +00:00
Alan
a0cad405a4 Add secondary goal: medicine for specific treatment. (#31114) 
* Add secondary goal: specific treatments

* Complete goal and make text user-readable.

* Include paradise.dme

* Use typed lists?

* Apply suggestions from review.

* Apply suggestions from review.

* Autodoc reagent lists in medicine of type goal.

* Add trailing commas to medicine type list as requested.

* Spelling fix.

Co-authored-by: Pooble <90473506+poobsie@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: Pooble <90473506+poobsie@users.noreply.github.com>
 2025-12-26 22:01:34 +00:00
warriorstar-orion
06c90a166b add more details to ai controller debugger (#31278) 2025-12-26 21:39:58 +00:00
DGamerL
b9c92e286d Lowers chemthrower prices (#31326) 2025-12-26 21:36:01 +00:00
DGamerL
231a1206c3 Larger than expected (#31265) 2025-12-26 20:44:42 +00:00
CRUNCH
8703edf492 Adds SSD for Silicons (#31205) 
* Silicon SSD

* Tied everything with a bow

* Update code/modules/mob/living/silicon/robot/robot_logout.dm

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

* Update robot_mob.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: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-12-26 20:35:14 +00:00
Vengie0
670202be06 Fixed the sign emote from letting you sign any number (even negative numbers) (#31295) 
* Fixed the sign emote from letting you sign any number

* added a single forward slash to please the linter
 2025-12-26 10:56:22 +00:00
CRUNCH
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
PollardTheDragon
b211866196 Nerfs knife availability (#31318) 2025-12-25 23:09:59 +00:00
CRUNCH
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-orion
d45fe9cef4 use loaded cooking machines in station kitchens (#31304) 2025-12-25 20:59:16 +00:00
Toastical
4433f60e18 Make ruptured lung appear in the organ containing the lung (#31303) 2025-12-25 09:49:56 +00:00
iramoye
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_Hobo
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
Alan
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-orion
6d9a04bdb9 several SSshuttles guardrails (#31238) 
* several SSshuttles guardrails

* move cast to loop
 2025-12-24 16:36:22 +00:00
Asmerath
afe1d8b35d Adds 5 new Hairstyles (#31203) 2025-12-24 15:44:53 +00:00
warriorstar-orion
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
Pooble
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
Alan
7ebbd0c39f Check if Poly is alive before fleeing attack. (#31334) 2025-12-24 14:53:11 +00:00
Toastical
16d0b18953 fix round-end credits using the wrong toggles var (#31327) 2025-12-20 17:44:10 +00:00
CRUNCH
cf9d730b03 Update photocopier.dm (#31328) 2025-12-20 00:16:26 +00:00
PollardTheDragon
ef07d66eb7 Fixes smith knife names (#31315) 2025-12-19 13:24:05 +00:00
Toastical
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
CRUNCH
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
CRUNCH
30243db95c Update photocopier.dm (#31321) 2025-12-19 11:28:48 +00:00
warriorstar-orion
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
Christer2222
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-orion
194de8e78d add ai controller debugger to context menu (#31301) 2025-12-18 18:18:06 +00:00
warriorstar-orion
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
PollardTheDragon
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
CRUNCH
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
Alan
8a0e7203cf Fix supermatter sandwich checker when using tongs. (#31246) 2025-12-18 08:53:54 +00:00
Toastical
532fea62d4 remove repeated element add (#31299) 2025-12-17 18:06:35 +00:00
1080pCat
4bb94b0924 Update migo.dm (#31286) 2025-12-16 08:54:29 +00:00
Alan
9a30586488 Add a cooldown to Bubbly Beep's drink message. (#31228) 2025-12-16 07:56:08 +00:00
BiancaWilkson
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
Toastical
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
1080pCat
0a0071ae21 Update telecomns.dm (#31275) 2025-12-15 17:07:22 +00:00
Contrabang
1cd35e567c fixes staff missing control_freak access (#31263) 2025-12-15 16:38:49 +00:00
Alan
1c7c6f6b74 Add mail to unwrappable objects. (#31264) 2025-12-15 16:22:31 +00:00