cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 09:38:43 +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
51 Commits
Author SHA1 Message Date
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
ToasticalandGitHub b319767611 fix picking up plants with bags (#30184) 2025-08-21 20:22:55 +00:00
BurzahandGitHub c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
DGamerLandGitHub 098b13bb33 Removes the empty type of /snacks (#26010) 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-29 14:46:04 +00:00
MigratingcocofruitandGitHub 6db06b1eb8 Plant DNA Manipulator update (#25370) 
* WIP

* changes

* more changes

* chnges

* update

* changes

* I suck at TGUI if you see this please help

* UI a bit better still figuring it out

* More things

* Eject Select, Select empty and autoselect empty implemented. can insert replaace stat/all stats from disk list

* Ready to make a PR

Disks can be loaded into the machine from boxed, an empty disk is automatically selected once an extraction is performed if one is available. All insert and replace buttons moved to the disk lists. Window size and scaling changed to fit LSD properly without wrapping.

* minor ui tweak, fixes core stat disk being auto selected unintentionally. Loading via box now makes a sound.

* rebuild TGUI

* rebuild tgui

* implemented RO button/indicator in UI, Added null checks for can_add

* slightly shrink some buttons rebuild TGUI

* Rebuild TGUI

* use istype for type checks

* removes the disk compartmentalizer from maps

* removes Disk Compartmentalizer

* actually removes the disk compartmentalizer

* rebuild tgui and remove all remaining disk compartmentalizer sprites

* fixes a message being output to world instead of the user

* auto doc and readability improvements.

* some fixes

adjusts display name to display the new doubled percentages. Stored seed no longer counts as a disk for the purpose of reaching the disk capacity.

* Rebuild TGUI
 2024-06-28 18:57:32 +00:00
DGamerLandGitHub 37280f6404 Doubles all percentages for botany genes (#25710) 2024-06-12 18:40:59 +00:00
William AndersonandGitHub 4ae09135f8 Minor fixes to typos in Hydroponics (#25739) 
Fixing a couple of typographical errors - olive seeds were 'seads' and Gaseous Decomposition wasn't capitalized like all other traits were.
 2024-06-11 07:00:23 +00:00
DGamerLandGitHub f1e9114cd6 Nerfs gaseous decomposition (#25716) 2024-06-06 20:09:55 +00:00
warriorstar-orionGitHubLucS34N
 		0667f20681 move all EOL comments on typepath names to dmdoc (#23928) 
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 20:05:49 +00:00
DGamerLandGitHub 09ab95abdc Adds teslium (#24117) 2024-02-24 18:16:55 +00:00
DGamerLGitHubRyanHenri215
 		db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
DGamerLandGitHub 291daafb46 Potato batteries now have a minimum max charge of 1 (#23159) 
* Easy fix

* Wrong fucking proc
 2023-11-14 12:51:42 +00:00
ContrabangGitHubHenri215
 		48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777) 
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-12 20:59:43 +00:00
ContrabangandGitHub ce10f4d508 [TGUI] Botany plant DNA manipulator (#21271) 
* genemod 1

* gene mod

* icon replacement and prettying

* insert + cancel fixes

* remove operation = ""

* genemodder review part 1

* sirryan review part 2

* sirryan review 3
 2023-06-21 22:35:42 +01:00
moxianandGitHub e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +01:00
QwertytofortyGitHubCharlieSteelSlayer
 		c0802f2b90 Adds teleportation sickness to bluespace gene plants and bluespace crystals (#18218) 
* Adds teleportsick to bluespace genes and bluespace crystals

* Update code/datums/status_effects/debuffs.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* named stuff

* changes order

* Update code/datums/status_effects/debuffs.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-07-07 11:32:47 -05:00
CharlieGitHubSteelSlayermochi
 		0f7a8707ef [Ready] Refactors stuns and status effects. (#17579) 
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-05-24 16:35:26 +01:00
Fox McCloud b98929ac20 Removes Separated Chemicals 2021-09-15 13:14:27 -04:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Qwertytoforty 827ab7786a Nerfs botany potatoes 2021-02-07 10:47:54 -05:00
Fox McCloudandGitHub 8947e97f3b Refactors Electrocution and Tesla Zapping (#15357) 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
 2021-02-03 20:52:03 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
moxianandGitHub 290fbca27c Make can_inject deterministic; fix odysseus syringes sometimes not working [PR #12858, take two] (#14637) 
* PR #12858 revival

* Move the can_inject unit tests to unit_tests/

* Remove the can_inject unit tests
 2020-11-03 12:27:43 -05:00
joep van der velden d89572afee review changes 2020-08-08 07:39:25 +02:00
joep van der velden 0cccd0ebf0 Improves botany fruit logging. Make throw logging more logical 2020-08-07 23:55:11 +02:00
SteelSlayer db4d44901d on cross removal 2020-06-24 11:33:31 -05:00
SteelSlayer 7088de6bab slippery component 2020-06-06 15:35:12 -05:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud 5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
Fox McCloud 58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Fox McCloud 90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
Fox McCloud f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Kyep c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00
Kyep 1559887b17 Revert "splits teleportation fixes out of depot PR #8515" 
This reverts commit b6fdcff5e2.
 2018-08-02 09:51:03 -07:00
Kyep b6fdcff5e2 splits teleportation fixes out of depot PR #8515 2018-08-02 09:32:04 -07:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Fox-McCloud ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Crazylemon64 807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Crazylemon64 a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
uraniummeltdown 0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
uraniummeltdown 658e0f6a82 adds shadowshrooms from tgstation, nerf glowshroom glow a bit and add new vars for glow, add new shadow and red light genes 2017-03-11 13:36:04 +04:00
Fox-McCloud d1463d9718 solving conflicts 2017-01-26 06:59:16 -05:00
Fox-McCloud 73ac77e8df runtimes 2017-01-26 04:23:43 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00