cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
22 Commits
Author SHA1 Message Date
Mitchs98GitHubContrabang
 		19e1268f0f Cavity Time! - Ports 46 Desserts from TG (#26540) 
* recipe paths

* splits frozen deserts

* d320b129f8 Merge branch 'master' into cavitytime

* agony

* woe, food upon ye

* edit

* unhecks the .dme

* unduplicates ur grape tart

* da camel

* whoops

* give bungo a tang

* da review

* review 2, electric boogaloo

* yogurt

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Mitchs98 <mitchs98@gmail.com>

* yogurt, but for real this time.

---------

Signed-off-by: Mitchs98 <mitchs98@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-10-03 18:32:16 +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
DGamerLGitHubS34N
 		939532d948 Makes Geraniums and Lilies not subtypes of Poppies (#24271) 
* Easy peasy

* Fucking Delta

* Fixes stealth conflict

* Fixes it for real

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-12 13:00:34 +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
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
ContrabangandGitHub f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297) 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
 2023-10-03 18:27:51 +01:00
PopeDaveThe3thandGitHub 6f803bbca0 Adds a period to two flower descriptions. (#22030) 2023-08-23 21:19:15 -05:00
EdanGitHubSteelSlayer
 		6d73208ce8 Fixes sunflowers (#18729) 
* yes

* Update code/modules/hydroponics/grown/flowers.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-08-06 10:54:45 -05:00
PacifistDalek cf5ccab58b missed something 2021-10-14 13:10:41 -04:00
PacifistDalek 58f642fa7a content 2021-10-14 13:06:30 -04:00
AffectedArc07andGitHub 221ea814d8 Revert "Whole bunch of Hydroponics Sprite changes" 2021-10-14 08:00:32 +01:00
PacifistDalek 9fb48626e8 take me down to hydroponic city 2021-10-13 13:58:14 -04:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
Fox McCloud 5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
variableundefined d3f6886433 Hydroponic, food and reagent taste mult 2019-08-05 00:08:49 +08:00
joep van der velden e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
variableundefined 7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox-McCloud 3b59726371 Botany Reagent Changes 2017-02-05 06:25:39 -05:00
Fox-McCloud 5e9e417bb4 fixing flowers 2017-01-26 06:23:10 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00