Commit Graph
16 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
CRUNCHandGitHub 6bf1906823 Fixes potatoes not becoming potato batteries (#30251)
* Update potato.dm

* e
2025-08-27 20:06:27 +00:00
CRUNCHandGitHub dc629eb29e Migrates obj/item/food to the new Attack Chain (#29860)
* Creation

* Update food_base.dm

* FUCKING IF SPACE

* plants

* more plant

* Update tomato.dm

* Update root.dm
2025-08-19 06:53:49 +00:00
ContrabangandGitHub 1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
warriorstar-orionandGitHub 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
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
de1229b947 Removes various helpers that can be simplified in a single variable check (#24551)
* Removes the first weird helper

* Removes get_turf_or_move

* Slightly alters the sharp weapon proc

* Adds nullcheck to adjustBruteLossByPart

* Changes `is_dead`

* Adds `hasorgans` to the replaced list

* Update code/__HELPERS/unsorted.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Contra review

---------

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
2024-03-25 01:31:56 +00:00
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
PacifistDalekandGitHub 9aacf9fead New pumpkinhat and blumpkin hat sprites (#19429) 2022-10-20 20:35:28 +01:00
variableundefined d3f6886433 Hydroponic, food and reagent taste mult 2019-08-05 00:08:49 +08: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
Fox-McCloud 15b4fc04a5 plasma in blumpkins 2017-02-07 07:01:58 -05:00
Fox-McCloud 3b59726371 Botany Reagent Changes 2017-02-05 06:25:39 -05:00
Fox-McCloud 10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00