cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,182 Commits 26 Branches 2 Tags
012a00aafbd18e931d64bf22a4bbe04dffa7ea21
Commit Graph

131 Commits

Author SHA1 Message Date
kyunkyunkyun
1f461fe2d2 Nullify all armor that is equal to armor = null (#30116) 
* nullifier

* manually remove identical vars
 2025-08-19 13:13:41 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
warriorstar-orion
23bb467991 refactor human butchering trait (#28725) 
* refactor human butchering trait

* Update code/datums/elements/butchers_humans.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-03-25 11:13:37 +00:00
warriorstar-orion
f9ade844c9 Kitchen rework part 1: machines and recipes. (#28277) 
* Kitchen rework part 1: machines and recipes.

* update oldstation

* update updatepaths script number

* fix blank icon test

* remove old deep fryer completely

* fix duped recipes and recipe datum names

* add chef PDA cart to chefdrobe

* nerf grill wood consumption rate

* multiply food for cooking machine rating

* fix runtime

* add cookware to syndie base and oldstation

* remove dupe burger recipe, update syndie/oldstation setups

* nerf potency quality award

* buff burn/ignite times, remove pointless on_fire flag

* more grill woodburn nerf

* meh

* try and unfuck timing issues

* more fixes and icon updates

* more fixes

* more review changes

* fix linter

* disable pcwj debug

* fix grill and deep fryer overlays

* fix timers with no containers

* attempt to fix reagent adding issues

* more cleanups

* allow rped usage

* grammar, null checks, reagent display

* PDA updates, map updates

* fix mats values

* new panel sprites

* recipe fixes, add prep bowl

* revert unused icon file changes

* move this to mesh with smith TM

* remove food quality for now

* New sprites, autochef.

* fix examine text

* reduce oven cook times

* lots of fixes

* fix autochef recipes that start with reagents

* prevent shenanigans

* megapatch 1

* block ingredients behind oven door

* PDA app improvements

* remove unused proc

* fixes for cookbook, descontructions, completed steps

* allow empty containers with a tracker to be claimed

* allow reclaiming

* autochef reliability fixes

* autochef reliability fixes

* fix quality product count

* update updatepaths script

* better stack handling

* more fixes for stacks and reagents

* timers no longer turn off burners automatically

* autochef turn offs and make sure we can see output storage

* add microwave recipe for roundremoving player brains

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* burza review 1

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* fix berry muffin name while i'm here

* grill -> microwave in new tests

* grill -> microwave in new tests, but actually for realsies

* i definitely know what i'm doing

* redundant attack chain setting

* add examine text about clearing buffer

* remove unused vars and start improving docs

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-03-23 04:59:08 +00:00
Contrabang
b313fafdea Adds Pizza cutters (#28490) 2025-03-01 04:25:10 +00:00
ExusA
584e6b26d5 Adds the RSF Executive Service Upgrade for cyborgs (#27371) 
* Adds the Executive RSF cyborg upgrade.

First commit for the Executive RSF with basic functionality.

* Add cheese knife

Adds a cheese knife along with the RSF upgrade to cut the cheese.

* Executive RSF Upgrade functionality.

Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.

* Nerf cyborg cheeses

Nerfs cyborg cheeses to be worse than chef food.

* Resprites Smoked Cheese

* Fixes power cost calculation

* Cleanup

* Standardize tech and Materials cost

* Adds caviar trash

Adds an empty caviar can.

* Edam and flavor

Add Edam

Adjusts flavors to compete with cheese reagent

* Undo sprinkled donut

Undid changes to RSF donut

* Fix RSF icon missed pixel

* Boolean fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* Resprites basic cheese

Resprites basic cheese at the request of @DGamerL

* Update new cheese sprite

Adds wax to the new cheese.

* Delete unused cheese icon

Deletes a prototype cheese icon.

* Readds normal cigarettes to the executive RSF

Adds normal cigarettes back to the RSF at Fordoxia's request.

* Turns caviar from red to black

Rebrands caviar into the fancier, black variety

* Deconflict

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-12-06 14:03:58 +00:00
warriorstar-orion
525c68d617 Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834) 
* refactor: Attack chain, initial setup.

* migrate curtain to make dreamchecker happy

* update thurible

* don't call attacked_by separately for legacy attack chain

* remove duplicate proc

* condense similar code, put allowances for legacy code in new procs

* update docs, include diagram source

* add comment on how to update diagram

* fix admonition

* mindflayer updates

* remove commented out code

* clarify all steps

* after_attack should be overridable

* whoops

* retrofit recent changes

* duh, can't restrict this yet because of tool_acts

* i hate ore bags with the fire of a thousand suns

* return correct value for object attack logic

* Various cleanups.

We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.

I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.

* simplify some argument names

* fuck it

* make it do the thing

* Rename CI module call

* Prove that CI works

* improve test output

* aaand fix it again

* fix curtain tool interactions

* fix compile error

* fix compile error

* Better docs, introduce migration plan tool.
 2024-12-02 23:36:36 +00:00
DGamerL
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
Henri215
ec90b441ad Moves weapons sprites out of items.dmi (#24634) 
* Moves weapons sprites out of items.dmi

* lets revert this

* oversight from energy melee PR
 2024-03-19 17:08:35 +00:00
Charlie Nolan
36b202bd26 Standardize on exclaiming about committing suicide. (#24433) 
* Standardize on exclaiming about committing suicide.

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

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

* Apply suggestions from code review

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

* I think this is the last of the unexciting suicides.

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:18:36 +00:00
PopGamer46
939c09431e IPC ghetto oversight fix (#23794) 2024-01-21 21:30:24 +00:00
DGamerL
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
ZERO-XZB
2b9ca38824 Bug fix for carrot shivs Fixes #22556 (#22627) 
* carrot_progress

* more carrot testing

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* Bugfix for #22556

* Bug fix regarding carrot shivs (#22556)

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* testing item.dmi fix

* hopeful items.dmi fix

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

Adds Contrabang's suggested parens.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-03 17:40:02 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584) 
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

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

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

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-01 11:47:25 +01:00
LiberatedWaveMan
e09be2b54e You got a fuckin' problem mate? Adds the glass shiv (attempt 2) (#22416) 
* Redoes the Shiv PR, adds shiv (ready to go)

* Update code/modules/crafting/recipes.dm

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

* Update code/modules/crafting/recipes.dm

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

* Update kitchen.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-09-19 22:47:53 +01:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108) 
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
 2023-06-03 09:50:22 +01:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748) 
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
 2023-04-25 21:13:02 +02:00
Henri215
5fc267c58d Adds in hand sprites for plastic fork, pspoon, pspork, pknife and spork (#19082) 
* adds in hand sprites for pfork/pspoon/pspork

* added in hand sprite for plastic knife

* forgot to add left hand for spork,spoon and fork

* no idea how that sprite got removed

* fix spork icon and add right hand

* left hand for spork

* ??

* fixing conflict mistakes

* test

* ..

* left hand fix

* fix of the fix
 2022-10-01 00:18:09 -05:00
KalevTait
6a91840962 Code Readability - Weapons (#18171) 
* weapons

* weapons

* prefer explicit time

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

* Don't have code on same line as control statement

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-10 13:59:33 +01:00
hal9000PR
3b7e9fee93 refactors butchering of humans with chainsaw/meatcleaver (#16812) 
* traits

* examine

* I am incapable of writing

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

* people

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-11-05 09:11:10 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
SabreML
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
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483) 
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
 2021-02-21 21:25:19 +00:00
SteelSlayer
d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
AzuleUtama
da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -07:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
e05e85618f nah, needs a refactor 2019-08-19 20:15:29 -04:00
Fox McCloud
3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
UmeFuu
5db7dafc38 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
-----
Fixed, it didn't work before for some reason
 2019-02-13 00:16:17 -03:00
UmeFuu
ca2fa7c3b3 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
 2019-02-12 20:26:12 -03:00
Mitchell
242ef496cf Removed extra comma. 2018-12-07 16:24:54 -06:00
Mitchell
54c4325c46 Adds Sushi Mat and Sushi Makiroll 
Makes sushi 100% more efficient and viable to make a restaurant out of.
 2018-12-07 13:28:10 -06:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
IK3I
f94f77fc50 The Utensil of the future! 2018-01-23 18:45:55 -06:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud
04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00