Commit Graph

105 Commits

Author SHA1 Message Date
Henri215
931c36fcfb Some fake virus tweaks (#22591)
* Some fake virus tweaks

* renaming some vars
2023-10-01 11:43:08 +01:00
Contrabang
dd9837401b Reading books can help decrease brain damage (#22582)
* librarian has a purpose now

* i forgot to push this

* lewc review
2023-09-30 08:37:49 -04:00
Luc
0e3677fd15 update hud status on death (#22338) 2023-09-14 21:04:25 +01:00
DGamerL
6144baf737 Adds a new ability to the Gargantua subclass: Desecrated Duel; alongside a small buff (#21858)
* let the wall of errors begin

* alright that's enough for today

* more pain

* only 7 errors

* arena :)

* smaller arena

* slight cleanups

* okay we ask charlie for help tomorrow

* leap works

* okay we ball

* idk I'm just adding this for now

* WE HAVE A CIRCLEEE

* Charge back + timer!

* first steps of the buff

* more cleaning up

* Buff is progressing nicely, almost done

* OKAY WE BALL

* Whoops last things

* whoopsie forgot this

* 20 Stamina damage

* 150 blood now

* WE GOT ANIMATE IN THIS HOUSE

* we be impact immune now

* IT DOESN'T LOOK LIKE SHIT (and goes through walls)

* ok ship it

* Consistency

* I'm buying charlie a bottle of asda rum

* Okay, ready for review

* Henri + Hal reviews

* More reviews + I am stupid

* Charlie review

* Ohhhh so that's why it didn't work

* Yeet this

* Charlie review

* Comment

* Charlie review kinda

* Hal review

* DESECRATED DUEL WOHOOO

* Oops I changed this

* That's one thing done

* Lewc review

* Lewc review part 2

* Update code/__HELPERS/trait_helpers.dm

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

* Lewc review + ICON WOOO

* Aaaaaaa

* TGUI FIXED

* Henri review

* Charlie review

* Charlie review

* Henri review

* Jimkil review

* Update code/__HELPERS/game.dm

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

* Charlie review

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 16:48:14 +01:00
Luc
d392209cb5 Reworks CPR, allowing it to extend defibrillation time (#21754)
* Update traditional CPR to loop automatically

* Implement most of the base stuff

* Bring over most defib changes so far

* Checks and fixes

* cleans up some leftovers, getting it ready for review

* Little bit of IPC flavor

* excludes non oxy-breathers, sorry!

* Better rescue breath handling

* Refactor revivability into a status effect

* Adds a little bit of feedback

* Removes the original variables

* Allows for CPR to activate cavity bombs

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

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

* snake case time

* breathid instead

* remove unused proc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-09 21:59:47 -05:00
Nathan Winters
fa05932d09 Buffs Rod of Asclepius (#21983)
* Refactor mass heal out into a proc; readability

* Make user's healing particles more accurate

* Make target's healing particles more accurate

* Make Rod of Asclepius not waste heal points on healthy targets

* Let Asclepius Rod heal robotic limbs

* Fix simple animals sometimes not producing heal particles

* Fix Asclepius Rod not updating health after fixing burn wounds

* webedit temptation

* Remove redundant checks and healing from carbons

* Simplify silicon damage check

* Who wrote this

* Clarify two `if` checks

* I forgor

* Get this linter a True...

* Simplify? the simplemob health check

* Avoid healing if `health` is somehow > `maxHealth`

* Assume `heal_points` is always an int

* Fix human limb injury healing sometimes making `heal_points` negative

* Microoptimization
2023-09-01 23:06:00 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
HMBGERDO
ab04ec8744 Vomit no longer stuns (#21952)
* vomit no longer stun

* KnockOut on blood vomit

* review tweaks

* TRUE FALSE

* oops

* stun into should_confuse, 0 into FALSE, 1 into TRUE

* god damnit
2023-08-28 13:53:26 +01:00
XFirebirdX
c4547e7251 Removes old lines of code mentioning genetic_damage, fixes text misleading to receiving "genetic_damage". (#22068)
* Removes and changes unrequired code and false text

* Update code/modules/antagonists/changeling/datum_changeling.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-08-25 17:04:25 +01:00
Henri215
f57212e8be Fixes a fake virus runtime (#22050) 2023-08-25 16:24:54 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

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

* Apply suggestions from code review

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

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
GDN
a4010a9525 buffs the mind batterer (#21758) 2023-08-12 18:54:19 +01:00
Qwertytoforty
4e96730cae [s] fixes a bug (#21939)
* REAL PAIN. REAL SUFFERING. REAL GOD WHY AAAAA.

* more space per space
2023-08-10 17:10:25 -05:00
Contrabang
f06f209f92 Revolutionaries now have a grace periods from attacks after beating deconversion (#21716)
* deconversion help

* scuffed?
2023-07-24 15:38:48 +01:00
JimKil3
bcea9d3377 Cryogenic anomalies & armor (#21603)
* cryogenic anomaly

* sprite

* reactive gelidic armor

* america number 1 raaah

* sprite (thanks atp)

* qwerty suggestion

* floor freezing

* Update code/game/objects/effects/anomalies.dm

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

* steel review commit 2

* whitespace apparently? idk

* whitespace fix (real)

* vetus

* Update code/game/objects/effects/anomalies.dm

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

* Update code/game/objects/effects/anomalies.dm

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

* Update code/game/objects/effects/anomalies.dm

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

* Update code/modules/clothing/suits/armor_suits.dm

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

* Update code/modules/clothing/suits/armor_suits.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* early return thing

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-24 15:11:21 +01:00
GDN
4c1144db1d readds the mind batterer, fully reworked (#21193)
* readds the mind batterer, fully reworked

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

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

* moer changes

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* sean review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-17 14:57:25 +01:00
BiancaWilkson
978f43c5e9 Ear Organ Refactor + Deafness is a status effect (#21405)
* begone ear_damage

* pt 2

* this time actually begone

* ears no longer passively heal over time

* ears can die

* deafness is now a status effect

* Oh yeah ticks are every two seconds
2023-07-07 13:54:27 +01:00
Qwertytoforty
032b065214 Buffs the uplink thermal safe drill (#21312)
* commit stuff for safety

* making sure this shit saves

* I am commiting every 5 frames now, sorry. I lost 25 frames as the file got corrupted

* 45 frames

* 51 total frames now

* 55

* 65

* 70 frames

* 75

* 80 frames almost there

* Behold, a useful uplink item.

* removes debug message

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-06-28 15:38:55 +01:00
Contrabang
bdcc418467 You can now help intent click on people to complete a dap, highfive, or handshake (#21251)
* dap moment

* lewcc review

* lewcc review
2023-06-17 11:08:59 +01:00
Nathan Winters
162a03ba15 Fix Drowsiness and Drunkenness rolling their effects way too often (#21290) 2023-06-14 21:03:32 +01:00
HMBGERDO
2f89b304d3 garrote tweak (#21092) 2023-06-02 18:00:05 +01:00
HMBGERDO
02db93e37e Stunbaton delayed knockdown now respects antistuns (#21069)
* stunbaton delayed knockdown now moved into status effect

* renaming proc to keep its meaning

* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED

* cleanup, little bug fixing

* cleanup

* whoopsie

* updates

* signal string changed

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-06-01 18:36:44 -05:00
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884)
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

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

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

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

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-02 21:28:34 +02:00
Charlie
e6085895c1 burn wounds, for real this time (#20542)
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-04-14 15:58:38 +02:00
Henri215
2a40482e58 Ports TG Fake virus event (#20573)
* Ports TG Fake virus event

* weight and comments

* GDN review

* Splitting into four different fake viruses

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/__DEFINES/status_effects.dm

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

* Sirryan review

* Apply suggestions from code review

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

* create_log for the fake virus

* using lists inside of lists

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Apply suggestions from code review

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

* farie review

* Checking fake_emote length

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-18 11:44:55 +01:00
Coolrune206
1f01292347 Gives fleshmend a weakness to cold (#20505)
* gives fleshmend a weakness to cold

* Thanks Henri

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

* Sirryan review

yup, this is better

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

* Sirryan review

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

* Farie review

* Naming is hard

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

* don't think about code while you're still in bed

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-17 08:50:27 +01:00
Luc
eafe04f41f Pops up a little bubble when you're requesting a high-five, along with some other emotes (#20472)
* High five!

* Add in-hand use

* use in hand too

* closing remarks

* better looking

* Fixes daps

* grab my hand fat man

* hand shake

* Implement missed messages

* i can spell

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

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

* Review concerns

* Add some auto-doc, minor changes

* more cleverly handles pointing

* Update code/modules/point/point.dm

Path clarity

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-15 20:37:54 +01:00
Henri215
52e5c478fe Making hallucination great again (#20320)
* make hallucination great again

* 10x the current hallucination
2023-02-27 21:07:00 +01:00
HMBGERDO
e491aa9c2e Fiber Garrote now mutes all emotes when garroting target (#20393)
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent

* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"

This reverts commit bc093ba01f.

* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds

* comments update, status set function standartisation

* Update code/datums/emote.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 01:12:56 -06:00
Springf
9504e00ba2 Refactor Fleshmend into a Status Effect (#20031)
* Fleshmend Refactor

* Reworked buff to match existing code in effect

* Clean up formatting

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

* Syntax and formatting updates as per comment suggestions

* Update code/datums/status_effects/buffs.dm

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

* Clean up array code

Cleaned up some array code, changed a segment where an array was manipulated while iterating through it to instead collect expired instances and remove them after.

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-07 13:50:37 -06:00
Coolrune206
40ff4f0005 Fixes BDM trophy causing you to take absurd damage (#20336)
* fixes BDM trophy causing you to take absurd damage

* Hal9000 request

* reduces number of calculations

* converted to global vars to save calculations

* Revert "converted to global vars to save calculations"

This reverts commit 116cd35ae7.
2023-02-01 13:23:29 +00:00
Qwertytoforty
9315f5c104 Cult ghosts begin to die if they go too far from the summoner (#20196)
* you are dead pls nerf

* Update code/datums/status_effects/debuffs.dm

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

* Get_dist_euclidian

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-01-31 22:14:45 -06:00
matttheficus
35476ab2c2 Allows the Kinetic Crusher to Parry Melee Attacks + BDM Trophy Tweaks (#20170)
* Parry this you filthy casual

* BDM offset
2023-01-31 22:07:12 -06:00
Qwertytoforty
de313cf3a5 Legion cores no longer fix bones / ib on station, unless implanted. (#20176)
* legion cores no longer fix bones / ib on station.

* Apply suggestions from code review

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-19 15:40:13 -05:00
Qwertytoforty
7fb017915f Makes cling tentacle more reliable / less shit (#19855)
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

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

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-06 21:31:37 +01:00
BiancaWilkson
ce5f8059b3 Buffs and cleans up atomic panacea (#19904)
* panacea uses invoke async

* Update code/modules/antagonists/changeling/powers/panacea.dm

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

* its a status effect now

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 16:31:12 +01:00
Farie82
1ba7e14fc2 Adds Blob burst status effect to both blob mice and humans (#19678)
* Add blob burst status effect to mouse and human

* Mouse cleanup

* Blob code refactors

* Change description

* Undo testing changes

* fix final stage

* Better map text. Thanks to Vi3trice

* Update code/datums/status_effects/blob_burst.dm

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>

* Update code/game/gamemodes/blob/blob.dm

* Duration fix + potential GC fix

* Update code/game/gamemodes/blob/blob.dm

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

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-11-26 15:41:48 +00:00
S34N
667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
Farie82
53938406bd Ensures status effects can't be added post qdel (#19292) 2022-10-14 22:51:13 -05:00
Charlie
5785c3638f Removes Shadowstep. replace it with 2 powers for each vampire type. (#18951)
* WIP

* shadow boxing

* garg + hemomancer

* dantalion and stuff

* oops

* some tweaks

* sprites, tweaks and TGUI

* ready for review

* review

* forgot some sean comments

* oops

* prevents people walking over shockwaves

* shadow boxing DPS down to 20

* oops

* affected review
2022-09-30 12:32:53 -05:00
Qwertytoforty
7d9213e0c2 Ports TG cursed katana to replace our cursed katana. (#18757)
* Ports TG cursed katana to replace our cursed katana.

* OH, IT'S JUST A SIMPLE NUMBERS GAME!

* More changes / additions / removals

* unneeded comments

* more things

* Apply suggestions from code review

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

* Update code/__HELPERS/lists.dm

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

* Update code/modules/mining/lavaland/necropolis_chests.dm

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

* should have commited this too

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

* Update code/game/gamemodes/wizard/spellbook.dm

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

* removes status, death signal, turf rename, return true

* sprites my hated

* Hal / steel requested changes

* built in

* quest 1/2

* Extra spacing / github instantly resolved status_effects and did not let me change it.

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-07 13:36:29 +01:00
Edan
58f0419399 Legion Rework (#18819)
* initial changes

* crusher trophy + other changes

* oops

* status effect change

* charlie review 1

* spacing

* sentience type

* Update code/modules/mining/equipment/kinetic_crusher.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-05 01:11:49 +01:00
Charlie
359552b1f4 Fixes the knockout trait and simple mob sleeping (#18567)
* makes the knockout work

* forgot to remove the calls here
2022-08-02 23:45:07 -05:00
Qwertytoforty
daca998981 [TM READY] Ports lavaland elites from TG. (#18448)
* startup, expect like 50 unneeded icons, not bug free™️

* Hope works. Cloak works. Buffs for AI controlled. Faction fix.

* map speed buffs, fixes resummon health decay

* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.

* I am denser than bluespace ore

* x2 antag cooldown, update desc for cloak

* removes 66% burn damage resist from elites

* honestly just knock that down

* herald not speaking right, fuckup with max hp fix

* Thanks hal!

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

* changes, changes, and more changes, oh my!

* Update code/datums/status_effects/buffs.dm

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

* GC stuff

* oh, and just one more thing

* no gibtonite gaming

* Huston we have a FUCKING PROBLEM

* oopsy doopsy

* but just one more thing (again, gc stuff)

* Lets all elites speak their mind

* NO LAVA

* grab ghost, legion charge red.

* dust the dusting from the code

* no mirror cargo shuttle crossing

* need to stop making small changes, x2 broodmother

* herald no longer crashes the MC

* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers

* remove extra brackets, x 2 on aoe squares

* pandora now respects factions

* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message

* requested changes

* mirroring a wanted change

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 20:22:28 +01:00
Bm0n
7f83855f49 Maybe actually removes the last of the red crosses but probably not (#18533)
* this better be the last red crosses

* cmo icon

* just going to fix the cmo icon while i am here

* revents spawner icon changes

* defines blob colours
2022-07-29 20:11:32 +01:00
Charlie
2fe69c6d53 hotfix (#18528) 2022-07-23 19:06:23 -05:00
LightFire53
18ef75f687 Adds a Gym to BoxStation Dormitories and Removes Exercised Buff/Bath Salts Malus (#18397)
* DO YOU EVEN LIFT?!!?

* You do not get THOSE gainz from punching

* In which I keep being code baby

* Baby steps

* The final touches

* KERCHOW!

GOTTA CHANNEL YOUR INNER MR. TORGUE WHEN MAKING COMMIT NAMES!

* WHO EVEN NEEDS DOORS ANYWAY

* Sean and Bmon

* THE ANTI-BUFF

* HEY, IT COMPILES

* IT COMPILES BABY!

* Apply suggestions from code review

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-23 15:34:01 +01:00
Charlie
02c5819fd4 Reworks Cults stun hand (#18247)
* cult stun hand rework

* FUCK

* Update debuffs.dm

* removes the alert

* Qwerties request

* steel review + new icon + to chat
2022-07-20 13:17:53 -05:00
Charlie
707a92c46d Rebalances antistun chems (#18084)
* rebalances antistun chems

* missed some

* oops

* tweaks

* makes adrenals heal shock and heart failure

* typo

* moxian review

* aaaaaa

* I FORGOR

* steel review
2022-07-15 11:09:40 -05:00
Qwertytoforty
acc48358b4 Adds a new mecha-fauna to lavaland. Ready to TM (#17999)
* pain

* more progress

* progress continues

* more progress™️

* saving progress while I swap brances

* leg moving working for real, woo

* more saving as power goes out

* eeven more

* fix transfer

* More changes, closer to pr ready

* final stuff for night backup

* almost done™️

* almost done

* Final changes to get ready for posting

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* new sprite

* Loot added (minus crusher loot)

* Apply suggestions from code review

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

* Defines, loot, and requested changes, oh my!

* Apply suggestions from code review

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

* sound, bluespace charge improvements, more text

* Update code/game/gamemodes/nuclear/pinpointer.dm

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

* WOOO CRUSHER ITEM

* don't code when dead tired kids

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* Makes crusher loot work, reworks shield for mecha fauna

* Names it, lets it spawn, buffs it, should be ready.

* Adds better sprites.

* pick to rand

* Buff, prevent cheese.

* Merge conflict hook test

* double checking to see if I installed it or not, think I need to manual

* fixes the merge issue

* makes gibtonite not yeet the mechafauna as much.

* fixes hostile/hostile fuckup

* fix most beam issues

* extra qdel insurance but it should be good

* fixes chasm issues, beep on self destruct, extra bluspace charge

* Shrinks the kaboom.

* spelling + beam fix

* Apply suggestions from code review

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

* late_initialize, var names, and styling, oh my!

* attacl

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-15 15:28:07 +01:00