Commit Graph

48 Commits

Author SHA1 Message Date
Bm0n
1b25a5b021 Surgery sounds 2: Now with volume mixer! (#26884)
* fuck it

* these too

* ooops

* i did it again

* moved some vars around

* updates generics

* rematch

* oh shit i think this needs a break

* agh

* wall

* updates comment

* compile after 2 years

* this might break things

* typo fix

* restores surgery sound to default

* Misplaced thingy

* support for some new ghetto surgery changes

* organ2

* Update code/modules/surgery/bones.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/surgery/surgery.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review change

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-10-06 09:40:33 +00:00
Luc
cb4d709c78 Fixes some extraneous spacing in some messages (#26222)
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-07-20 00:15:21 +00:00
S34N
2e4089dc15 Various TG Chat message sorting fixes (#25229)
* Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses

* Apply suggestions from code review

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-04-29 02:07:25 +00:00
DGamerL
378630370f Refactors custom_pain to work on organs instead of on mobs (#23160)
* Wolf request

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

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-12 19:45:26 +00:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Luc
346a1b8142 Yet Another Surgery Refactor (#18325)
* Initial commit

Fixes up surgery.dm
Adds some tool behavior

* More basic changes

* Checkpointing: this is a little gross right now

* Add signal COMPONENT_CANCEL_ATTACK_CHAIN

* Cleans up surgery initiator

* Mostly gets surgery (and canceling it) working

* Add abstract proxy surgery steps

Also adds them to organ manipulation

* Clean up most existing surgeries

* Rework organ openness, adds define for aborting a beginstep

* surgery works again, also implements retry defines

* fix surgery computer

* add limb repair to synth implant removal

* retry implant checks

* Clean up abductor surgeries as well as some other things

* A lot
- Reworks organ manipulation to use a series of surgery steps instead
- Fixes some runtimes with open hands
- Lets mito zero out the germ level while treating necrosis
- Adds a debug surgery tool

* add debug surgery tool, note some TODOs for later

* Add conditional check for surgeries repeating

* update surgery retry logic to make it more of a bonus

* Lets abductors automatically retry any failed surgery steps

* Rework robotic surgery to use abstract/proxy steps

* Bunch of bugfixes and more!
- Limb reattachment works properly now, you can just slap a limb onto a person
- If the limb isn't robotic, it'll be useless until the surgery is finished with a hemostat, though it might be enough to get the patient out of the OR.

* Remove more now-implicit checks

* Slight reorganization

* more fixes across the board

* Remove unused variable

* Trying not to lose my mind here
- Does away with can_run() entirely
- Cleans up visible messages in code
- begin steps should now all have ..() afterwards
- slime bone surgery should be fixed now
- more docs

* Robotic  surgery is stoppable with a crowbar, all surgery can_start now checks parent

* Fix some broken robotic typepaths

* Typepath fixes, do away with some last TODOs

* Forgor

* Last cleanups before we go gold

* jk lol

* Make early surgery termination clearer

* More "last" cleanups

* Fixes tool flags, surgery initiation

- Fixes surgery not being startable by sharp objects
- Moves surgical tool flags to item traits

* Clean up surgery cancellation, especially for borgos

* I think this should GC better

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Status is now step number

* Add a 20% chance to find nothing during organ manipulation

* Improve documentation, make forced_surgery a normal arg

* Charlie's reviews

* Why are abductors like this

* Little more verification, ensuring limb augmentation and organ manip healing work properly

* Fix torso organ manip being unfinishable

* Fix cavity implants, open-hand/any item steps

* Make sharp objects not try to start an operation with help intent

* Comments, quick target fix

* Re-order list so advanced bruise pack is pulled first

* Make surgical gripper function like an open hand

* Make mito only use one unit per organ for now

* Check if user is on operable surface before trying to operate

* Reduce admin logging

* Fix some bugs that appeared during the testmerge
- you can no longer start robotic surgeries with a scalpel (lol)
- you can now cancel surgeries on the first step after I fixed some bugs that I introduced (woo hoo)
- Synthetic limb attachment is now combined into a single startable surgery step, though still retains the fun flavor of both

* Swats some more bugs
- (hopefully) fixes a huge source of runtimes where we tried to check if we could run surgeries before checking if the surgery used an organ
- In doing so, moves the logic for determining if a surgery can start to the mob-level
- Fixes robotic reattachment surgery not working

* multi-bug drifting???

- Fixes a bug where a branching surgery with an any tool option could possibly override a step with a matching tool
- Fixes some intermediate surgeries failing due to not having specified possible_locs

* A few more fixes
- Fixes any surgery tool steps again
- Fixes cavity surgery again

* Hopefully fixes getting stuck in robotic organ manip

* Remove extra parent call

* Steel review

* Steel review

* Fix spacing for possible locs

* Roundstart traits

* Advanced surgical traits and other hal fixes

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-16 18:48:43 +01:00
alex-gh
fc2b99bd51 Surgery refactors (#18183)
* Remove dead code

* Refactor magic numbers to defines
2022-07-05 21:20:38 +02:00
Charlie
31b336da64 minor external organ refactor (#16183)
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-12-01 22:17:44 +01:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
tigercat2000
cb3627e6af Merge pull request #9066 from Fox-McCloud/pain-refactor
Pain Refactor and Tweaks
2018-06-13 14:24:53 -07:00
Fox McCloud
e9c4568c4f tweaks 2018-05-27 14:15:14 -04:00
Fox McCloud
8b05cce9f3 Pain Refactor and Tweaks 2018-05-23 14:54:54 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage()
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
TDSSS
1e7575afde Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain. 2017-10-15 15:28:25 -07:00
Vivalas
dc0a008fe2 Merge branch 'master' into splint_nerf 2017-08-13 23:13:24 -05:00
Fox-McCloud
93abbe25a4 BURNNNNNNN 2017-07-15 23:43:51 -04:00
Vivalas
dcf46204c9 Splint nerf 2017-06-21 15:01:23 -05:00
Crazylemon64
04dfa164b4 Don't worry, bones grow back (You can now mend incisions after
having cut someone's ribcage open, at Fox's request)
2016-08-21 13:13:56 -07:00
Crazylemon64
7d2983b4bf Makes IPC surgery much more reliable, object insertion surgery
works better now, and `can_use` is actually called now.
2016-08-14 18:12:23 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloud
10fc58fe50 Merge pull request #3487 from Crazylemon64/slime_fancy_stuff
Fancy Slime People features
2016-03-08 20:18:51 -05:00
Crazylemon64
309d9fc9e6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_fancy_stuff 2016-03-05 02:55:00 -08:00
Fox-McCloud
4316775c1a Surgery Tweaks 2016-03-04 21:47:41 -05:00
Aurorablade
fe3eb50b5e I'M GOING TO OPERATE
OPERATE!
2016-02-29 21:23:25 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
d861d86edd halp
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
2016-02-21 23:55:47 -05:00
Aurorablade
c5011003bd its done
Review it, test iit locally. going to bed now, long shift at work
tomarrow.
2016-02-12 03:04:24 -05:00
Aurorablade
b42d865c83 almost ready for review 2016-02-11 23:21:13 -05:00
Aurorablade
5e8fa9de84 commiting before fixing merge conflicts
and stumps cuase i think i got a fix from of all places bay
2016-02-11 14:36:16 -05:00
Aurorablade
3b90cb703a almost ready for review 2016-02-08 01:16:13 -05:00
Aurorablade
12b3ccb2e2 why 2016-02-04 23:57:11 -05:00
Aurorablade
e926935703 onward to merge conflicts! 2016-02-02 02:57:39 -05:00
Crazylemon64
dc4c4977a4 Let's try this again 2016-02-01 21:11:11 -08:00
Aurorablade
c4d151ce34 you buy organ, yaya?
Is fresh.
2016-01-30 21:37:55 -05:00
Aurorablade
53f410272a home streach. 2016-01-26 20:53:13 -05:00
Aurorablade
2623f75e0d progress 2016-01-06 23:43:12 -05:00
Aurorablade
92e15c1b2a BREAK ALL THE THINGS 2015-12-31 01:23:44 -05:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Krausus
4283430159 Fixes surgery runtimes/errors 2015-05-18 06:12:40 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Bram961
32db2665a4 Permanent brain exposure fix
A fix too the permanent brain exposure glitch, now brain exposure can be
fixed by setting the skull
2014-06-26 12:13:01 +02:00
Chinsky
c84ce517e3 Changed way substitute tools are handled.
Now all tools have chance of success. Proper ones have 100.
If tool has less than 100 chance of success, it can fail the step.
2013-05-28 18:16:11 +04:00
Chinsky
e8f8138e04 Added priority system for surgery steps.
Steps with higher priority would be attempted first.

Added preparation step for item insertion surgery.
2013-02-22 23:06:37 +04:00
Chinsky
7f84b415a8 Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps. 2013-01-13 11:56:33 +04:00
Chinsky
3447c61e49 Moved surgery from WIP to modules, since it's not really that WIP anymore.
Split one huge file into several smaller ones for readability.
2013-01-13 02:11:06 +04:00