Commit Graph

446 Commits

Author SHA1 Message Date
GDN
74c0d9cfab adds the bread smite (#22755)
* adds the bread smite

* you cannot escape
2023-10-12 17:15:46 +01:00
Vi3trice
b08a5d8f9a Add edge cases to summon item spell, and tweak to feedback if object is hidden (#22710)
* Cavities and implants, oh my

* Headpockets too, and sneaky summons now

* Update summonitem.dm

* Update summonitem.dm
2023-10-12 15:35:03 +01:00
Christasmurf
5b6a2de4ca Procedure dmi split + IAA resprite (#22580)
* dmi split and code stuff - species sprites coming soon(tm)

* species sprites

* update sprite name

* CI errors?

* CRLF to LF

* forgor species code

* Update code/modules/clothing/under/jobs/procedure.dm

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

* readds the ability to make cluwnes (how did this happen)

* fuck off shitcode breaking my shit

* Apply suggestions from code review

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

* forgor to delet extra sprites

* Suggestion

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* booleans

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:31:38 +01:00
GDN
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

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

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01:00
Qwertytoforty
e2cf5d5977 fixes slaughter demons being broken (#22738)
* fixes demons killing people forever / not yeeting peoples bones / sensors / cling shenanigins, basically just fixes them

* should do this to avoid stacking
2023-10-06 02:29:42 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
SchrodingersWolf
4ce0b08f9c Slightly nerfs and fixes slaughter demon healing (#22384)
* /mob/living/simple_animal/demon/slaughter

* Tuning down skill level to 'I'm too young to die'

* We call this a DIFFICULTY TWEAK

* Bloodcrawl and HP tweak gone, inverted logic fixed

* Forgot some stuff - Now added

* Procrastination is a slow and insidious killer
2023-10-01 14:13:10 +01:00
SchrodingersWolf
cd85b9ba33 The Skill Level is now sk_baby - Nerfs Bloodcrawl (#22397)
* /mob/living/simple_animal/demon/slaughter

* Tuning down skill level to 'I'm too young to die'

* We call this a DIFFICULTY TWEAK

* All demons get to join the fun too (Except Shadow)

* Cooldown is reduced to 1 second per request
2023-09-25 18:59:28 -04:00
DGamerL
630ff3722d [s] Lowers xenomorph acid damage on living mobs (#22291)
* What does acid taste like?

* Contra Review

* Contra Review

* Contra Review

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-19 16:58:01 +01:00
tristan1333
6983d4962c Fixes runtime, cluwned clowns waddle after being cluwned (#22379)
* Fixes runtime, clowns waddle after being cluwned

* pointless override removed
2023-09-16 20:44:32 -05:00
Qwertytoforty
d42d2f647d Added the Combat Bakery Kit (#21901)
* QUASO

* Apply suggestions from code review

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

* blame lewc for giving me spaces

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/components/boomerang.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/granters/_granters.dm

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

* purge that

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 21:32:30 +01:00
HMBGERDO
d5248db5e0 Blood pool now tries cardinal move if diagonal is blocked (#22049)
* blood pool now tried cardial move if diagonal is blocked

* turn() instead of switch
2023-09-01 23:09:58 +01:00
PopeDaveThe3th
0b39956cf1 Fixes the Timestop spell (#21998)
* Fixes the Timestop spell

* Update code/datums/spells/conjure.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-25 16:45:49 +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
JimKil3
58f2d4b185 da fix (#21961) 2023-08-12 19:33:46 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
Charlie
5ccd8241c4 homing projectiles + wizard spell (#21752) 2023-07-24 15:52:17 +01:00
Qwertytoforty
70541d997c Xenomorphs can no longer make resin in pipes (#21427) 2023-06-22 11:04:00 -05:00
GDN
de35644d17 fixes lesser drake weirdness (#21334) 2023-06-21 22:52:29 +01:00
GDN
1df67a2edf removes a debug check that I forgot to cut (#21357) 2023-06-18 14:30:22 -05:00
HMBGERDO
b74cd79c03 Allows us to drop NODROP items if there is other way to get rid of them (#21080)
* adds proc to check if we can drop nodrop items

* C:/Program Files/Git/obj/effect/proc_holder/spell/touch refactor, support for wizard spells, xeno spells and changeling shield

* bug fixes, cleanup

* moved to signals, added support for mime fingergun

* fixed bugs

* cleanup

* same proc for removing weapon from active or any hand

* changeling fast swap exist again

* cleanup

* fix runtime

* signals cleanup

* review update

* Update code/datums/spells/mime.dm

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

* Update code/datums/spells/mime.dm

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

* Update code/datums/spells/touch_attacks.dm

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

* review updates

* fixing bug

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-15 19:18:17 +01:00
GDN
b05e27bb17 Adds summon supermatter, a new wizard spell (#21096)
* Devious intent

* bam

* also this

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

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

* now a shard

* Update code/datums/spells/summon_supermatter.dm

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

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

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

* improved code

* log name removal

* good enough

* conflict

* sprite by mcramon

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-15 19:16:47 +01:00
GDN
ad768f9ef5 Reworks sentient swords (#20585)
* initial changes

* fixes attack animations

* we lunging out here

* lunge sprite by ATP engineer

* rare oldcoder w

* more stuff

* polished

* removes testing stuff

* no longer works on backpack slot

* moving damage values around

* shawn reviews + cheese reduction

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

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

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

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

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

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

* reviews

* re-upload

* Update code/datums/spells/sentient_sword_lunge.dm

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

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

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

* merge conflict fix and readds debug spawn

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

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

* deconflict

* ryan's reviews

* improvements

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-06-12 19:39:43 -05:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051)
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
2023-06-02 14:30:17 -05:00
GDN
4621a8a05f morphs now show up the orbit menu antagonist section (#21145)
* morphs now show up on antaghud

* ismorph changes
2023-06-02 19:57:17 +01:00
Contrabang
f75a27ec97 sentiental (#21002) 2023-05-11 12:33:44 -05:00
GDN
80454ec8eb fixes negative plasma on xenos (#20950)
* fixes negative plasma on xenos

* Update code/datums/spells/alien_spells/basetype_alien_spell.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-27 18:28:32 +01:00
S34N
b90845c2e3 Balances skeletons by adding a subtype (#20587)
* balance skellies

* spoopy and scary

* more skellybones

* Ancient

* Apply suggestions from code review

* Update code/modules/mob/living/carbon/human/species/skeleton_species.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-27 20:39:24 +02:00
S34N
fa040cdb65 Fixes gamma armoury hatch cheese (#20479)
* Fixes gamma armoury hatch cheese

* mira fix
2023-03-26 15:08:54 -05:00
GDN
c7d3492514 the mime's force wall is now destructible (#20399)
* the mime's forcefield is now destructable

* semi-invisible

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

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

* this should be fine, if this breaks we'll know quickly

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-06 23:50:41 -05:00
GDN
aa56d75f93 [Ready for code review] Moves alien verbs to spells (#20002)
* Moves alien verbs to spells

* lol

* Standardization, polish, making alien plasma huds more consistant

* The very cursed way of handling touch spells

* logging + more polish

* snakecase + documentation

* finishing touches

* oops, ty henri

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

* sprites from TGstation

* sprites, again

* oops

* farie's review part 1

* farie's review p2, signals

* Erics PR compat

* farie's review 3

* that too

* the shawnshank redemption

* boink

* removes larva transfer plasma

* you want a sprite cranberry?

* TM fix 1

* FUCK I BROKE LOGGING

* bam

* final touches

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-02-12 21:34:11 +01:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
Vi3trice
07a7caff1f Polishes the Shadow Demon (#20245)
* For the basement dwellers out there

* Update bloodcrawl.dm

* Update bloodcrawl.dm

* Update bloodcrawl.dm
2023-01-20 19:12:16 -05:00
GDN
156f0e69cf Tones down rathens (#20165) 2023-01-18 11:37:16 -05:00
Eric6426-Blossom
190313723b Fixes changelings and legion cores allowing for revival within Slaughter and Laughter demons (#20166)
* DemonFix?

* FaerieReview

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

* Fixpart2

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

* safetyqdel

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-16 21:53:50 +01:00
Qwertytoforty
cfc31154e7 Wizard forcewall now has a 15 second cooldown vs 10 second (#20052)
* Wizard forcewall now has a 15 second cooldown vs 10 second

* Apply suggestions from code review

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-04 17:17:35 -05:00
Charlie
8ef4aa727e Adds Shadow demons (#19732)
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 11:26:37 -06:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Qwertytoforty
a88828ff47 Ports spacetime distortion spell from TG (#19658)
* NanoMap Auto-Update (Wed Sep 23 20:02:25 UTC 2020)

* Deconflicts

* Revert "Deconflicts"

This reverts commit a52c425136.

* Update filingcabinet.dm (#14616)

* updates haloperidol and nanocalcium to take less effort to modify. (#14612)

* Rename all instances of "virgin" being used as a variable name to more appropriate and self-explanatory variable name

* Oops

* Update filter.dm

* lore fix (#14627)

* breaks spacetime and or smoothing

* spelling, range upgrade for more points

* actually fixes it

* sprite via ramon

* 20 -> 15

* Apply suggestions from code review

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

* removes element

* sigh

* god I love icon conflicts

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* henks requests

* Update code/datums/spells/spacetime_dist.dm

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

* Henks changes

* Update code/datums/spell.dm

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

Co-authored-by: NanoMap Generation <action@github.com>
Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
Co-authored-by: variableundefined <40092670+variableundefined@users.noreply.github.com>
Co-authored-by: SteelSlayer <alexgcopeland123@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-12-24 18:11:23 +01:00
Coolrune206
5b7d0a9fa3 Re-adds Rathen's Secret to the Spellbook (#19913)
* Re-adds Rathen's Secret to the Spellbook

* grammar
2022-12-24 10:58:21 -05:00
Coolrune206
9bca5ac7b2 Prevents eternal Rod Form (#19881)
* makes rod form not work while jaunting

* Revert "makes rod form not work while jaunting"

This reverts commit fb1be0f482.

* prevents eternal rod form

* hal9000 review
2022-12-11 15:16:28 -06:00
AzuleUtama
bfdeb87aed Merged forcewall and greater forcewall into a single spell (#19739) 2022-11-24 22:52:24 +01:00
Coolrune206
e8fcba9900 Shortens the Mime's invisible wall duration (#19695)
* shortens mime spell wall duration

* Contrabang suggestion

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2022-11-15 19:26:11 +00:00
S34N
0a441dc5d7 Revenant buff (#19577)
* spooky

* not yet tested

* i hate my life

* CI

* Update code/datums/spell.dm

* Update code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

* review pass 1

* wise charlie words

* icons

* farie suggestion

* double vars

* haha oops

* bye you useless waste of space

* more damage

* farie review

* pass 2

* and this

* this is not a bool

* Apply suggestions from code review

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

* charlie review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-11-10 21:10:03 +01: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
warriorstar-orion
85f4503d33 Refactor announcements. (#19459)
* Refactor announcements.

* Actually make this a unit test

* Dumb

* Remove unnecessary 'as text'

* Reviews:

- Make CSS class a recognizable word
- Flip the defaults for logging

Also:

- Style fixes (default null in fields)
- Fix emergency/crew-transfer shuttle announcement titles
2022-11-02 20:31:37 +01:00
Vi3trice
03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
warriorstar-orion
6cc02b58cc Fix runtimes caused by proc signature change. (#19464) 2022-10-23 12:23:35 -05:00
Henri215
f00232d5d6 Fixes #19331 Teleportation spell no longer grants free smoke when cancelled (#19384)
* no more smoke/shouting when not selecting a tp location

* Apply suggestions from code review

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

* redundant else

* resolving conflict

* removed silence

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-10-21 20:21:45 +02:00