Commit Graph

203 Commits

Author SHA1 Message Date
Qwertytoforty c7fb93075c fixes katana runtime (#18993) 2022-09-08 12:38:38 +01: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
Qwertytoforty b1be1b5a36 Ports TG berserker armor from TG to replace champion hardsuit. (#18854)
* NT does not recommend punching fauna to death

* need x2, don't want reflection

* Armor -> brute burn resist, speed removed

* phys not species

* light em up

* Apply suggestions from code review

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

* a hex on you

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

* spacing, bolding, only stamina

* Apply suggestions from code review

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-06 00:05:36 +01:00
Qwertytoforty d6e24aa850 hierophant staff / blue / red cube no longer ignore teleport blocks (#18868) 2022-08-21 09:31:16 +01:00
Viz d4b3767631 Tendril Drop Armor Rebalance (#18698)
* gamma ert gear begone

* blood for the blood god
2022-08-05 19:03:55 +01:00
Edan 1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +01:00
moxian 8befe47408 Initialize hostile mobs (#18336)
* Initialize hostile mobs

* Farie's review

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

* staticify lists

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-07-24 13:14:06 +02:00
GDN 8c625c3bcc Removes the voodoo doll (#18500)
Doesn't even work + it has stun and GC issues

Part of stun removal project progression and AA's MTDC project
2022-07-23 15:26:17 +01:00
Charlie ded049a902 Spell cooldown refactor (#18327)
* Squashed commit of the following:

commit 979fe5287c3dd33cd5d69bdd968beae245984f2e
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Sat Jul 9 23:40:53 2022 +0100

    guts the old system

* refactors spell cooldowns into a handler

* charge datum

* garbage collection

* cleanup, renames cooldown var

* review changes

* boo cooldown fix

* styling

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-23 00:00:42 +02:00
Viz c03cdf6140 Removes Mining Guardian from Necropolis Chests (#18482)
* i am not sorry miners

* you get nothing from me
2022-07-22 16:35:26 +01:00
Vi3trice 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
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
Sirryan2002 ebf23682d5 Meathook now uses KnockDown instead of just Weaken (#18255)
* its knockdown time

* weaken tweak
2022-07-10 15:15:35 +01:00
KalevTait 99c1adbcf2 mining (#18283) 2022-07-09 12:24:55 +01:00
moxian 09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845)
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

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

* farie's review part 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-06-29 08:33:52 +02:00
Charlie 77d03f7ab9 Spellblade rework (#17693)
* fire lighting and shielding

* blink + lavaland loot

* file move and projectile removal

* get out of MY WALLS

* review

* sprites

* forgot this

* sprite update

* Apply suggestions from code review

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

* some TM changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-06-06 16:22:18 +01:00
Charlie 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
Luc 1b3b040ce5 Hopefully fixes spectral blade letting ghosts stay visible (#17602) 2022-04-12 15:53:37 +01:00
Luc b2704e06b2 [GBP: No Update] Fixes orbiting in vents and disposals (#17330) 2022-01-18 19:05:44 +01:00
Luc 8bec8c75b3 Orbit Refactor, Add Orbiter Count (#16718)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-01-13 16:12:36 +01:00
Farie82 576482907b Refactors spell targeting to delegate it to a targeting datum (#16552)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-12-13 17:40:36 +01:00
S34N e23ee29fad Removes "name" design datums. Adds logging for null design error. (#17165) 2021-12-06 07:53:05 +01:00
Farie82 3c129736cd Fixes the Rod of Asclepius dupe exploit (#17112) 2021-12-03 15:06:51 +01:00
Fox McCloud 15ab57d78c Merge pull request #17047 from hal9000PR/PUZZLE
Removes prison cubes
2021-11-18 15:57:07 -05:00
S34N 44c12c6d9d Fixes open crate sprites (#17050)
* fakin underscores

* more crates

* sneak this one in too
2021-11-06 21:42:47 +01:00
hal9000PR 8e581d06c2 remove don't remove 2021-11-06 18:25:21 +00:00
SabreML 1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
Sirryan2002 8da063ce17 Removes the Honk for good 2021-09-18 00:30:08 -04:00
SabreML 02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
SabreML 6b326123ac DNR ghost spawns fix (#16458) 2021-07-30 14:57:36 +01:00
hal9000PR 9f008f3de4 jacobs ladder removal from tendrils (#16324) 2021-07-09 11:21:20 +01:00
Qwertytoforty f8bc686abb Adds the B.S.G (#15798)
* Adds the 100% original and serious BSG

* Adds sprites

* prevents divide by zero

* Adds to protolathe, shield from projectiles, prevents hitting through walls

* adds sprites for inhands, pain, and suffering

* Finished the gun sprites.

* Adds admin version, sound effect, visual

* moves chain to base projectile, adds shitty sprite for bsg explosion

* Fixes it, maybe.

* I hate merge conflicts, gun sprites are back

* I need this, it seems.

* re-adds sprites back

* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

* Apply grammer and spaceing suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Makes the code clearer, use update icon, fix shaded charge

* Better inhands, tweaked base sprite

* Better explosion effect, mochi suggestion, PR ready

* Accidently removed this

* I did not intend to put this in, I discarded this change

* Update settings.json

* Spelling and return removal

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

* Removes spawn, makes it a callback

* Lowercase states

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-08 22:48:54 +01:00
Qwertytoforty 4d26621d0b Fixes being unable to pickup the armblade nullrod on mining (#16189) 2021-06-16 10:02:58 +01:00
Farie82 7f6a28f16d Respawning using anomalous crystal exploit fixes (#16165)
* Ahud anomalous crystal fix
Makes it so that you can't get around ahud enabling using the anomalous helper crystal

* Merge conflict fix thing
2021-06-12 18:13:42 +01:00
S34N ddacfbb009 fixes exploit (#16164) 2021-06-12 16:22:35 +01:00
Qwertytoforty 5896bd2c8e Fixes some exploits (#16134) 2021-06-07 18:46:16 +01:00
SabreML 76e237edc5 Fixes HUD sunglasses deconstruction (#15444)
* sunglasses

* Unit test test

* Unit test test tested
2021-03-14 13:17:20 +00:00
hal9000PR 6232f9e196 Nerfs drake form. (#15235) 2021-03-14 10:27:20 +00:00
Qwertytoforty 9ee679cded Adds more magic items and spells to the wizard spellbook (#15036)
* touches more or less everthing that is magic

* Other changes I forgot to put in

* removes extra s

* nevermind lets not do drake form

* Apply suggestions from code review

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

* Better variable name

* Heart curse removed

* Re adds new stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-03-14 10:15:05 +00:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud 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
Fox McCloud adc6dd7a11 Purges Unsimulated Turfs: Touches Up CC Areas (#15527)
* Purges Unsimulated Turfs: Touches Up CC Areas

* 2 additional turrets
2021-02-16 11:44:21 +00:00
Qwertytoforty 8f9ab3dac6 Prevents the possessor crystal from possessing bots (#15424)
* Prevents the possessor crystal from possessing bots

* Update code/modules/mining/lavaland/loot/colossus_loot.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-02-10 18:21:29 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Qwertytoforty c946d5ee2b Less instant death of captain (#15301) 2021-01-20 09:53:44 +00:00
AffectedArc07 8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
Nazsgull a90b34d1fd Hierophant staff nerf (#14018)
* Hierophant club will now malfunction on station

If you are on station and try using it, it will only spawn a few sparks.

* Revert "Hierophant club will now malfunction on station"

This reverts commit 89d48dbc07.

* Nerfs Hierophant club so it cannot be used on station

Now if someone uses it onboard it will malfunction

* Gets rid of "timerMalfunction" var

* Timer refactor

Makes only one check for timer, instead of doing two

* Removes unused variable

* Refactors hierophant to early return

As suggested by farie82

Co-authored-by: awdaw <uo251631@uniovi.es>
2020-12-22 18:44:19 +00:00
AffectedArc07 f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
Nazsgull 1123476af6 Nerfs Lava Staff (#13971)
* Nerfs Lava Staff so it cannot be used outside mining z level

Added  a timer and a spark system to spawn sparks when lava staff malfuntions.

Lava staff will check what z level is his user on, and if it's not mining will only spawn a few sparks.

* Updates description

Old description made little sense as lava staff will no longer work at the emergency shuttle.

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm

Adds spaces between method call parameters.

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

* Removes unused spark effect system

Since I'm using do_spark() I don t really need a whole spark system.

* Gets rid of "timerMalfuntion" var

Instead of using 2 variables to do the same, "timer" will now control the cooldown for when the staff works and for when it malfunctions.

* Removes unnecesary time check

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: awdaw <uo251631@uniovi.es>
Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
Co-authored-by: farie82 <joepvelden@hotmail.com>
2020-12-16 15:28:11 -05:00
Edan52 fdc3a9fe2e Makes Bubblegum fightable (#13202)
* nerf

* remove other loot
2020-12-16 14:55:15 -05:00