cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 09:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,036 Commits 28 Branches 2 Tags
c8d32f848486ed8c7e84becfc9536bc1b389fa0f
Commit Graph

45 Commits

Author SHA1 Message Date
Kyani
f81ef075f1 The NGCR: Nuclear Fission Reactor (#30493) 
* coefficient balancing

* damage and meltdowns

* meltdown stuff

* alert stuff

* lots of work - whew

* some enrichment code

* rod encrichmnt

* working on enrichment

* more fabrication

* rod fab

* start to the nuke

* overload sprites

* overload code work

* some overload tweaking

* small tweak

* coolant ejections and QOL things

* overheat events + ripley gripper

* rebase + venting code

* save before rebase

* some pre-work for rods

* finishing the base rods

* fixed my dme

* de linting

* tiny lint fix

* more lint fixes

* linting

* linting

* linting

* linting

* linting

* temp delint

* temp delint

* undo TM stuff + minor fix

* didnt save

* some fixes

* fixes

* fixes and engine repair

* fixed broken durability decay

* LOTS of things

* tgui

* lint

* linter

* linter

* minor shit

* Update boxstation.dmm

* major refactors and fixes

* saved this

* critical testing tweaks and fixes

* fixes and tweaks

* smithing start

* forgot to save

* craftables + grill start

* saved

* fix

* more grill work

* Update tgui.bundle.js

* linter

* linter

* fixes

* rod fabricator initial

* cooking work

* push

* soundwork

* sound work tweak

* comments + sounds + toxins gen rework

* lots of work

* sprite stuff

* deconflicting

* delinting

* bundle rebuild

* prettier

* feex

* fuck you OD

* who asked?

* update to tgui

* another edit to tgui

* finish tgui

* remove debug metadata button

* rod tweaks for tgui

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/parrot.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_misc.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/smithing/components/misc_components.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update tgui/packages/tgui/interfaces/NuclearRodFabricator.jsx

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Spans

* tgui build

* rod redo

* improve tgui for fabricator

* sprites and centrifuge/fab work

* tgui update

* spritework

* cyberiad + hydrogen conversion

* kerberos + counter

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* sprite + fab tweak

* tgui bundle

* lintering

* bugfixing

* linting

* linting

* event tweak

* add missing gases to fission monitor

* issue fixing

* sprite/overlay fixes

* mapping

* stations again

* space lattice

* tine tweak

* linter

* no rod alerts

* buttons

* loose wire

* make it so you can interact through rod casings and the uhh big thing in the center, what's that called again

* fixes

* door fix

* many bug fixes + crates

* fab ghost touch

* water convert + maint sprite + fixes

* pack changes + neighbor fix

* doors rename

* didnt save

* hydrogen fix

* map tweaks

* repair fixes + corium LETHALITY

* upped broken rad damage

* pipe rename + overload icons

* more roundstart moderators

* rod tree tweaks

* tweaks

* pack and enrichment fixes

* misc tweaks and fixes

* fixes: Density, circuits, coolant offline negation

* Apply suggestions from code review

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review changes

* linter + fix

* reviews and fixes

* LOTS of tweaks and changes

* supermatter kit

* spacematter balance

* tgui

* fixes and tweaks

* didnt save this

* mapping + smith fix

* cargo rods arnt radioactive til opened

* Apply suggestions from code review

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review items

* fixes

* linters

* moving components out of nullspace

* examine fix

* Update tgui.bundle.js

* explosion nerf and minor fix

* Apply suggestions from code review

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* reviews

* map fix + ripley rad immune

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review

* fix chamber examine

* tweaks + rod fab disk drop

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* review changes

* Update code/modules/power/engines/fission/nuclear_rods.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* fixes

* tgui bundle

* small rod tweaks

* Update code/game/machinery/computer/buildandrepair.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/smithing/components/reactor_components.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor_machines.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/power/engines/fission/reactor_machines.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* reviews

* Update code/modules/power/engines/fission/reactor_machines.dm

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

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Paul <pmerkamp@gmail.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-01-07 09:19:43 +00:00
PollardTheDragon
b211866196 Nerfs knife availability (#31318) 2025-12-25 23:09:59 +00:00
PollardTheDragon
ef07d66eb7 Fixes smith knife names (#31315) 2025-12-19 13:24:05 +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
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
PollardTheDragon
ffd9f7e2c5 Fixes smith knives not being able to embed (#31230) 2025-12-10 13:30:22 +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
Qwertytoforty
a58bdc8968 Caps the eshotgun damage multiplier from lens to 1.5 (#30663) 2025-10-19 19:25:12 +00:00
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
PollardTheDragon
6fdacb21e0 Fixes hand interaction with kinetic assembler (#30463) 2025-09-24 17:59:35 +00:00
PollardTheDragon
70537312ba Smith machines now drop their contained components on destroy (#30462) 
* Smith machines now drop their contained components on destroy

* Update casting_basin.dm
 2025-09-24 16:54:04 +00:00
kyunkyunkyun
83509c3967 Some more armor tweaks (#30398) 
* summary

* (required)

* undef

* oh this is unused, nice

* ok but.. why

* a tiny bit more

* Update human_defense.dm

* Update mass_hallucination.dm
 2025-09-19 15:43:42 +00:00
kyunkyunkyun
626eaaeb79 Removes british spelling of armor from armor_penetration vars (#30104) 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

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

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-01 04:27:52 +00:00
Arthri
0634be6107 Adds UIs to magma crucibles and smart hoppers (#29941) 
* Add UI to magma crucible and smart hopper

* Use multitile component in magma_crucible

* Move magma crucible in lavaland

* Increase smart hopper scanning range

* Build /tg/ui (#40)

Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>

* Remove identical variable

* Build /tg/ui (#42)

Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Aleksandr Sakrukin <99011379+JustSanyK@users.noreply.github.com>
 2025-08-12 06:08:16 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
PollardTheDragon
110e4142e6 Fixes Kinetic Assembler Runtime (#29751) 2025-07-17 20:08:01 +00:00
Toastical
7a3793c1e7 Set open panel icon states for kinetic and scientific assemblers, make them upgradeable by an RPED (#29606) 2025-06-17 16:38:32 +00:00
Kyani
586e2e6c4d Job Perks - True Professionals (#29478) 
* ddsadsa

ddsadsa

* moderate again

* revert

* medical first steps

* more work

* lots more work done

* more progress

* finished up

* attack chain linter

* attack chain update

* attack chain work

* fixes + chemist update

* gives comments
 2025-06-13 19:40:29 +00:00
PGray
796f91aeb5 Fix: Reset smithing machinery operation state when power is lost during operation, preventing equipment from getting stuck (#29419) 2025-06-07 14:15:26 +00:00
PollardTheDragon
7fa2648ab3 Nerfs gun parts material costs (#29296) 2025-06-01 16:30:25 +00:00
PollardTheDragon
b0fdf5fec1 Fixes components staying hot after completion (#29506) 2025-06-01 16:13:55 +00:00
PollardTheDragon
c283aa5d03 Fixes casting basin access not properly denying (#29507) 
* Fixes casting basin access not properly denying

* Better positioning
 2025-06-01 16:13:31 +00:00
PollardTheDragon
81a9ff0663 Fixes scientific assembler boards (#29508) 2025-06-01 15:50:34 +00:00
PollardTheDragon
5a298513fc Smith Polish: Adds access requirements to smith machines (#29295) 
* Adds access requirements to smith machines

* No smashy without access

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-05-27 20:53:28 +00:00
PollardTheDragon
91a70c3527 Smith Polish: Upgrades - Now in Color! (#29208) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-05-17 16:02:59 +00:00
Qwertytoforty
14842b9956 Smith visual update (#29289) 
* fuck me

* fix it
 2025-05-17 13:20:35 +00:00
PollardTheDragon
ebe65b7b71 Fixes golem having no access to smart hopper points (#29317) 2025-05-15 08:27:22 +00:00
PollardTheDragon
f6b14f6b66 Smith Polish: Fixes Radiation (#29166) 
* Smith Polish: Fixes Radiation

* Too many rads
 2025-05-13 21:44:57 +00:00
PollardTheDragon
cbb4bf6456 Fix! (#29290) 2025-05-13 21:27:38 +00:00
PollardTheDragon
a7b5c28f77 Smith Expansion - Smith + Xenobiology = Energy Guns (#29040) 
* Initial Commit

* Small adjustment

* Vendor stock update

* Icon states

* Finished merge, fixed runtimes, coded properly now

* Mapped in assemblers

* Swapped bluespace slime and sepia slime guns

* Replaced scatter laser with eshotgun

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-05-10 20:25:04 +00:00
PollardTheDragon
c4b6a10754 Fixes tool bit surgery fail rate (#29096) 2025-05-04 03:29:46 +00:00
PollardTheDragon
42099d95b1 Fixes runtime in power hammer (#29139) 2025-04-28 16:18:07 +00:00
PollardTheDragon
5a5e760f37 Smith Addition: Productivity Bit (#28999) 
* Adds productivity bit

* Digging sand

* Proper smithing costs
 2025-04-26 14:15:34 +00:00
PollardTheDragon
bef2f57a9d Smith Polish - Item Insertion QOL (#28973) 
* QOL

* Extra QOL
 2025-04-24 14:33:16 +00:00
PollardTheDragon
fb55c4b712 Fixes material movement mod (#29089) 2025-04-22 13:07:53 +00:00
PollardTheDragon
0a7ba807e1 Fixes lens fire rate modifications (#28998) 2025-04-18 19:25:46 +00:00
PollardTheDragon
09c0248c02 Smith Polish - Heating Rework (#28888) 
* Reworks heat

* Merge fixes
 2025-04-15 15:02:17 +00:00
datlo
e3accaea35 Fix smith machine sheet values (#28915) 2025-04-15 15:00:35 +00:00
PollardTheDragon
5da3694877 Makes bits and lenses craft in batches, blackboxes smith upgrade crafting (#28962) 2025-04-15 14:45:03 +00:00
PollardTheDragon
77cafb3b9b Smith Polish - Examines (#28887) 
* Smith polish - examines

* Forgot the hopper

* Merge fixes
 2025-04-15 14:28:43 +00:00
PollardTheDragon
2917943cfb Smith polish - sound fixes (#28949) 2025-04-11 18:07:39 +00:00
PollardTheDragon
af988b21f3 [s] Smith insert slowdown fix (#28961) 
* Smith insert slowdown fix

* Better values
 2025-04-10 23:43:15 +00:00
warriorstar-orion
eaf3f014c4 convert random smith item to spawner (#28931) 2025-04-08 13:49:39 +00:00
PollardTheDragon
315371c831 Adds Secondary Goals for the Smith (#28769) 
* Adds smith secondary goals

* Trailing newlines for the linter gods

* Request Consoles

* How dare you betray me, autocomplete?

* Mapping error

* Better documentation

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

* Grammar is gooder

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

* More gooder grammar

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

* Removed excess slash

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

* Typing var

* Adds debug errors if no valid rewards are detected

* Merge fixes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-04-08 12:58:49 +00:00
datlo
d46e2f8fde Reorganise smithing files into a modules folder (#28782) 
* reorganise smithing into a module

* move casts

* rename and move some files

* move defines

* update dme

* move hopper defines

* move ORM/hopper point defines

* remove redefine

* rename smith defines, move smith datums

* implement 28806 and 28877

* remove old files
 2025-04-04 07:59:01 +00:00