Commit Graph

23 Commits

Author SHA1 Message Date
Alan
24c47a3d79 Rework spray bottles and tools based on them somewhat. (#29977)
* Rework spray bottles and tools based on them somewhat.

Consolidate spray adjustment functions.
Change method of preventing spray amount adjustment.
Standardize most spray amounts at 10u/2 tiles and 5u/1 tile.
Should fix the following issues:
https://github.com/ParadiseSS13/Paradise/issues/29930
https://github.com/ParadiseSS13/Paradise/issues/28964

* Adjust spray rework based on review comments

Change `adjustable` var to boolean
Change `adjust_verb` to `adjust_action`
Tie spray transfer amount to tile reach
2025-08-19 00:26:53 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +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
CRUNCH
654a48ab86 Xenoborg flash no longer disappears when burning out. Removes nonfunctional spray. Alters some descriptions for xenoborg items. (#25281)
* Alters some xenoborg stuff

* oops

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* removes commented code

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-03 14:41:34 +00:00
Coolrune206
5a94bb7551 yeah, no (#20424) 2023-02-17 22:35:07 +00:00
S34N
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04: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
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Crazylemon64
36b967c93b Fully rips out cyborg sight modules 2017-01-10 00:32:11 -08:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Markolie
f6903f0152 Alien specific 2 2015-10-01 04:33:58 +02:00
Markolie
bb0bbdcf5a Alien claws fix 2015-10-01 04:27:59 +02:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
ZomgPonies
00bb67f470 Xenoborgs, XenoAI, awww yeah. 2013-11-24 04:52:53 -05:00