22 Commits

Author SHA1 Message Date
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
Contrabang 1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
kyunkyunkyun 8d92950a77 Custom patch icons for ChemMaster (#29206)
* custom patches

* item state ruins context menu's sprite
2025-05-10 20:45:43 +00:00
warriorstar-orion fc373d0fd6 dropper, patch and pill fixes (#28775)
* dropper, patch and pill fixes

* shuffle this around
2025-03-23 09:30:55 +00:00
warriorstar-orion 1c8dc2b5aa fix pill and patch activate in-hand (#28767) 2025-03-22 07:19:23 +00:00
warriorstar-orion 2429fa5674 interaction fixes for IV bags, chem bags, and syringes (#28765)
* interaction fixes for IV bags, chem bags, and syringes

* no more bap on patch application

* fix spray bottle ranged interact and double nozzle switch
2025-03-22 06:34:33 +00:00
warriorstar-orion 7eb404f562 attack chain migration: reagent containers (#28699)
* migrate reagent_containers.dm

* applicator migration + game test

* borg hypo migration

* condiment migration + game test

* fixed and expanded applicator game test, helper proc for puppet activate_self

* expanded condiment game test, added negative any_chatlog define

* drinks_base.dm migration

* bottle.dm migrated

* molotov migrated

* cans migrated

* drinking glass migrated

* shot glass migration

* bottles suck

* some fixes

* more bottle.dm

* bottles finally behave

* bottle fixed, shotglass fixed, everfull migrated

* bottle tests

* cyborg trashbag can crush autopickup is broken

* fixed cans insertion into backpacks

* added zone targeting to puppet

* more tests for drinks

* dropper migration

* dropper finished, removed a repeated proc

* smol tweak

* glass containers

* glass containers finished

* fixed can and bottle tests

* molotov test

* drinking glass and started shot glass

* fixed puppet activate_self + done with drinkingglass

* med containers, shuffle tests around a tiny bit

* fix autoinjectors

* remove return value from spawn block

* Apply suggestions from code review

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Toastical <toast@toaster.com>
Co-authored-by: Toastical <toastical@toaster.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-21 20:42:24 +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
Aylong 0ab96c50dc Patches resprite (#26626) 2024-09-11 14:00:10 +00:00
Nathan Winters da34941fae Minor pill/patch application refactor (#23958)
* Refactor pill/patch application

* I will come back to this
2024-03-01 11:39:25 +00:00
Nathan Winters 69da720b20 Fixes pills and patches displaying a fake transfer rate (#23539)
* Fix patches not preserving chem temperature

* Remove some leftover same-as-parent property assignments from pills

* Fix pills/patches showing their nonexistent transfer rate

* Revert "Fix patches not preserving chem temperature"

This reverts commit 8905280613.
2023-12-16 16:15:47 +00:00
DGamerL 307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
Burzah 30e461f60a Ert medic kit rework (#20561)
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

* Update code/game/objects/items/weapons/storage/firstaid.dm

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

* Update code/game/objects/items/weapons/storage/firstaid.dm

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

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-03-13 22:53:47 +01:00
Adri 9c1618139b Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904)
* Changes mannitol and mutadone pills

* Renames healing patch to brute patch

* Removes some NanoMed Plus products

* Moves insulin to contraband

* Removes unnecessary capitalization when it comes to reagent bottles

* Reverts mannitol sprite change

* Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category

* Makes syringes lowercase

* Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category"

This reverts commit 3d586665fe.

* Renames prespawned advanced analyzers
2022-08-29 11:10:16 +01:00
SabreML c266b27aed Another small bugfix bundle (#16260)
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 22:57:27 +01:00
Fox McCloud e438ff4d36 Makes Mobs Lazier and Removes Hard References (#13693)
* Makes Mobs Lazier and Removes Hard References

* fluff
2020-06-30 17:52:28 -06:00
Fox McCloud faecf7cbfa Patch rework (#13062)
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
2020-05-02 20:07:43 -04:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
AzuleUtama c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Citinited 4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox-McCloud ebb59ca511 Reagent Reorganization 2016-11-03 21:27:10 -04:00