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

11697 Commits

Author SHA1 Message Date
Christer2222
5ed784bc25 Improves the UX of crafting menus by adding more categories (#31035) 
* metal, wood, cloth, runed, bamboo,

* plastic

* brass

* glass

* electronics -> wall-mounted

* removed extra parenthesis

* moved floor lights to construction

* renamed stuff
 2025-12-14 15:50:34 +00:00
kyunkyunkyun
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
kyunkyunkyun
d3a457344a Fix set_sharpness not adding surgery component (#31215) 
* Update objs.dm

* Update surgery_initiator.dm
 2025-12-12 20:34:35 +00:00
Contrabang
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-orion
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
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
Christer2222
9e87289bd8 Makes the Long-Distance Cloning Machine indestructible (#31212) 
* added the tag

* more immunities
 2025-12-09 19:57:34 +00:00
CRUNCH
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
DGamerL
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
Alan
14badb5f4a Fix wheelchair mob layering. (#31193) 2025-12-09 00:05:36 +00:00
Toastical
96e617b4b9 add missing usr argument to tgui window in VV delete all (#31200) 2025-12-08 23:55:38 +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
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
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
Hayden Redacted
f4adee5f3a Fixes a Typo in the Reagent Scanner (#31178) 2025-12-04 23:54:27 +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
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
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
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
Alan
99fad46e39 Prevent non-adjacent mobs from spinning the roulette. (#31161) 2025-12-01 14:07:55 +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
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
0e8a6d0267 Fixes a Typo When You Deconstruct with an RCD (#31130) 2025-11-28 09:39:48 +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
Alan
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
Alan
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
CRUNCH
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
CRUNCH
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
CRUNCH
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
Ahzpy
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
Chap
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
1080pCat
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
CRUNCH
082b5283ad Update rpd.dm (#30973) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-16 11:52:42 +00:00
PollardTheDragon
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
CRUNCH
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
DGamerL
0d7929f34f Mops can now clean on disarm and grab intent (#30828) 
* Mops can now clean more easily

* Also changes the janicart

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

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@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>
 2025-11-13 23:23:57 +00:00
BiancaWilkson
9a8d5462ac Various skittish fixes (#30994) 
* skittish fixes

* Update code/game/objects/structures/crates_lockers/closets.dm

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

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-13 23:21:34 +00:00
Christer2222
7615c724d3 adds xenobiology headset (#30780) 
* adds xenobiology headset

* created xenobiologist locker

* adds the lockers to maps
 2025-11-12 20:16:57 +00:00
kyunkyunkyun
f96b26b75a /obj/item/projectile --> /obj/projectile (#30411) 
* yers

* vars

* map changes

* some comments (clearly not stolen from items)

* fix component

* summary
 2025-11-12 10:23:20 +00:00
Christer2222
aa536bba3a Gives ghosts the ability to spook mirrors (#30817) 
* adds behavior

* transparency test

* transparency

* mask and logic

* comments

* removed the chance for mirrors to break

* linting

* autodoc
 2025-11-12 07:22:39 +00:00
Toastical
51c47d8342 Fix compiler errors for 1670 (#30874) 
* stage 1

* hud alist

* mobs and parry

* stage ?

* we dont even need an alist here
 2025-11-11 10:38:24 +00:00
iramoye
9f1a329238 initial commit (#30887) 2025-11-11 10:30:36 +00:00
Alan
3af59de586 Update Research Director's suit and skirt, re-add (#30848) 
* Update rd's old suit and skirt and re-add them

* Thanks, linters!
 2025-11-10 16:32:38 +00:00
Qwertytoforty
746de75bdd Adds most shotgun ammo boxes to cargo. Allows them to be crafted. (#30837) 
* pope why didn't you test it haughughuugughuhguhguhgh

* ok let us be real it doesn't need 50 more what was I thinking

* oop

* a static shock

* spelling

* Update code/game/objects/items/weapons/storage/boxes.dm

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

* so full of order of operations yum

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-08 22:11:53 +00:00
Toastical
c656f53727 non-mobs typically don't have any cigarettes, mate (#30924) 2025-11-07 20:12:11 +00:00