Commit Graph
140 Commits
Author SHA1 Message Date
8b91d8b48e Refactors defib code into a component (#19987)
* Start to datumize the defib.

* Wire everything else up

* connect some loose wires from testing

* More changes from testing

* More cleanups and documentation

* Revert CMO defib to have a 10% heart-attack chance

* Review, clean up giant if statement

* other review things

* sirryan review

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

* change signals to direct proc calls

* rename variable

* Fix bad argument

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-16 20:19:03 -06:00
GDNandGitHub e510680a20 adds blackbox logging for revival (#19399) 2022-10-16 12:33:41 +01:00
ContrabangandGitHub 8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
LucandGitHub ad813f76d9 Allow cursed heart to be defibrillated up to three times (#18677)
* cursed heart but funny

* Flesh out this version a bit more

* okay fine you get three shots

miner gaming

* Bitwise

* Change wakeup method

* Address Steel's review
2022-08-24 12:00:25 -05:00
ContrabangandGitHub d6b38aa9ff Makes defib shocks dangerous (#18809)
* wow this is funny

* remove prob at Hal suggestion

* lewcc suggestion

* hal review
2022-08-18 13:49:52 +01:00
AffectedArc07andGitHub 34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
Vi3triceandGitHub f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
234a471cf9 Removes instant stuns from defibs, adds knockdown and stamina damage (#18456)
* fuck this

* initial and probably bad attempt at handheld defib

* let us give this an actual use

* it was bothering me

* i am a goofball sometimes

* i forgor

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

* charlie review 2

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-20 21:47:39 +01:00
Shadow-QuillandGitHub ced4e1f1e3 Fixes not being revived if a ghost enters the body during a defib (#18371) 2022-07-14 11:01:49 +01:00
CharlieandGitHub 0dc7d74cdc fix? (#17994) 2022-06-18 12:11:57 +01:00
LucandGitHub b9d7fd9045 [GBP: NO UPDATE] Notify ghosts of defib when paddles are applied, rather than just before shock (#17967)
* Notify ghost before windup

* 🎵 test your code, test your code 🎵
2022-06-15 14:39:34 +01:00
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
QwertytofortyandGitHub f98f3b796b Cleans / comments defib code (#17835) 2022-05-21 11:25:32 +01:00
LucandGitHub ed3454f577 Improve defibrillator messaging (#17429) 2022-03-04 21:36:53 +01:00
S34NandGitHub ac6f9b4725 [IDB Ignore] Refactor icon smoothing to use 8-bit bitmasking (#16620) 2021-12-15 17:04:24 +01:00
variableundefinedandGitHub fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
E-MonaRhg 23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
E-MonaRhg ee47ea90cb Makes the advanced defib give heart attacks as intended 2021-07-27 19:02:29 +02:00
E-MonaRhg 51a36cfb9f Makes the advanced defib emaggable + sprite tweaks 2021-07-27 18:11:12 +02:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
7906e66871 Adds feedback for defibbing and scanning husked people (#16357)
* husk

* extra space

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-26 18:08:37 +01:00
E-MonaRhg f83b8ae14e Suggested stuff 2021-07-09 19:44:02 +02:00
E-MonaRhg c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
SabreMLandGitHub 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
SabreMLandGitHub 6481a50506 'Do Not Revive' verb for Ghosts (#15934)
* DNR

* Review things

Bound to be something I missed, but testing all seems to work fine.

* Aliven't
2021-05-02 15:42:56 +01:00
E-MonaRhg abef5e648f Missing space begone 2021-04-17 22:56:23 +02:00
E-MonaRhg 4c96040791 Grammar and flavor stuff 2021-04-06 02:48:35 +02:00
E-MonaRhg c76cc81321 Fixed what was broken 2021-03-31 22:57:47 +02:00
E-MonaRhg 7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloudandGitHub fdc6ab2211 Damns Devils Gamemode to Hell (#15672)
* Damns Devils Gamemode to Hell

* Update config.txt
2021-03-07 12:00:02 +00:00
Fox McCloudandGitHub c73cc5aa68 Refactors Organ Shocking To Use Signals (#15593)
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
2021-02-26 18:43:11 +00:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
dearmochiandGitHub 196b23d3d5 Fixes some overlay screwery on death and revival (#15192)
* Toggles fullscreens off/on on death/revival instead of deleting them

Fixes a lot of issues regarding fullscreens (vulpkanin NV/welding shield
overlay vanishing, crit overlay not persisting on defib)

* Restores blind effect when defibrillated back to life

Fixes issue where the blind overlay wouldn't appear
when defibrillated, even though the patient is
unconscious/blind
2021-02-21 21:45:32 +00:00
Fox McCloudandGitHub 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
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
moxianandGitHub 16d2638c0a Cardiac problems have a dedicated icon on medhud, not a generic "disease" (#14900)
* Cardiac problems have a dedicated icon on medhud, not a generic "disease"

* Rename "huddefib2" -> "hudflatline"
2020-11-18 18:08:01 +00:00
26486a2261 Combat Defib - Cell Change (#14698)
* Combat Defib - Cell Change

* Source has been Implied

* Affected doesn't like Space

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-26 20:01:01 -04:00
Dovixx b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
Fox McCloudandGitHub b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
Evankhell561andvariableundefined af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -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
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
joep van der velden 47a63e3a51 Added a few tips and fixed a bug 2019-07-29 01:42:51 +02:00
variableundefinedandGitHub 742bc62c8b Merge pull request #11544 from Arkatos1/recharger
Rechargers now show their contents and charge status on examine
2019-07-08 20:18:36 +08:00
Arkatos1 fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00