Commit Graph
30 Commits
Author SHA1 Message Date
MixityMaxityandGitHub c4fb9bff75 Adds seven alternate finishes for the .357 Revolver (#31668)
* Adds Syndie Subtype and extra finishes

* Switches all mentions of standard revolver to the new syndicate version

* Wait why are we spinning the *barrel*

* removes duped name and description
2026-02-27 19:07:58 +00:00
kyunkyunkyunandGitHub b0463d3c83 Convert most spans to defines (#31080)
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
2025-12-13 23:55:48 +00:00
CRUNCHandGitHub 3b7af6c771 Warning Cones are Valid Wizard Hats (#30281)
* 🗼

* comma
2025-09-04 06:59:27 +00:00
ContrabangandGitHub 0b16de5266 "Fireball" unique wizard loadout is now explosion-proof. (#29963)
* fireball wiz angry

* oops

* tweak to code
2025-08-10 14:40:10 +00:00
warriorstar-orionandGitHub 0eafad8475 Refactor /mob/unEquip. (#27720)
* Refactor /mob/unEquip.

* fix things found in testing

* more fixes from testing

* fix removal of hooded suits

* fix flayers inability to deploy swarmprod

* fix changeling blade activation

* unnecessary parens

* pass default unequip args to proc overrides

* fix belts being able to forceMove into full hands
2025-01-10 01:58:35 +00:00
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-13 13:02:29 +00:00
eee8878024 Datumizes spells (#24242)
* datumized spells

* finished

* last changes

* conflict

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

* conflicts

* shitty runtime fix until i get to this tomorrow

* Update code/datums/spell.dm

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

* Update code/datums/spell_handler/alien_spell_handler.dm

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

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

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

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

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

* Update code/datums/spells/bloodcrawl.dm

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

* Update code/datums/spells/bloodcrawl.dm

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Update code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm

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

* Update code/modules/awaymissions/mission_code/ruins/wizardcrash.dm

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

* Update code/modules/research/xenobiology/xenobiology.dm

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

* Update code/modules/mob/living/carbon/superheroes.dm

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

* Update code/datums/spells/conjure.dm

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

* Update code/datums/spells/ethereal_jaunt.dm

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

* Update code/datums/spells/emplosion.dm

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

* Update code/datums/spells/turf_teleport.dm

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

* Update code/datums/spells/wizard_spells.dm

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

* Update code/datums/spells/wizard_spells.dm

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

* Update code/game/dna/mutations/mutation_powers.dm

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

* Update code/datums/spells/wizard_spells.dm

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

* Update code/datums/spells/wizard_spells.dm

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

* Update code/game/dna/mutations/mutation_powers.dm

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

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

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

* guess who just rework the entire malf ai actionsf ai

* gc better

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-04-01 07:42:21 +00:00
d3f85c6b67 Adds a new loadout to wizard: Fireball. (#23115)
* just fireball.

* requested changes

* review

* Apply suggestions from code review

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* review

* oops

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-11-08 08:52:48 +00:00
ContrabangandGitHub 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
45b8010edf Oblivion Enforcer Admin Loadout (#22348)
* enforcer stuff

* the outfit

* henri review

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

* Update code/datums/outfits/outfit_admin.dm

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-19 19:18:59 +01:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
6c21d7e6b4 Remove ethereal jaunt from oblivion enforcer loadout. (#22389)
* Remove ethereal jaunt from oblivion enforcer.

* Updated description

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-09-19 13:14:25 +01:00
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

* Update code/game/objects/items/theft_items.dm

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

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
DGamerLandGitHub 3caa9e56d6 Adds homing toolbox to the Greytider Wizard loadout (#22077)
* YESSS

* Henri review

* Forgor
2023-08-28 13:08:33 +01:00
EdanandGitHub a168bf68ac Logs wizard spell names instead of initialisms to the DB (#21136)
* improve wizard feedback data

* review 1

* readability improvement
2023-06-05 18:30:36 +01:00
warriorstar-orionandGitHub 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
AzuleUtamaandGitHub bfdeb87aed Merged forcewall and greater forcewall into a single spell (#19739) 2022-11-24 22:52:24 +01:00
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
47e52b0c60 Adds a greytide themed wizard loadout with His Grace (#18095)
* Adds a greytide themed loadout

* increase size of magical box

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

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

* add trailing new line

* handle plasmemes/voxes

* tweak to_chat for plasmamen

* Fix wizarditis removing plasmaman helmets

* Replace teleport by force wall

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-06 21:18:56 +01:00
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
farie82andGitHub 8e8ad65906 Makes most targeted spells select a target on click with a radius (#13220)
* Basis

* Make most targeted spells use a click with radius instead of a list

* Fixes

* Selection code

* return ..()

* Auto targeting

* Forgot a comment change

* Merge issue fix
2020-09-18 10:30:32 -04:00
SteelSlayer 0be544354d tweaks 2020-06-09 13:59:59 -05:00
SteelSlayer c87c90e019 blacklist gunreaper 2020-06-08 16:34:48 -05:00
SteelSlayer 07523da595 ragin mages fix 2020-06-08 12:44:13 -05:00
Patrick Meade b45e32e2d6 Fix spelling of Disintegrate 2020-05-22 17:50:04 -05:00
datlo d0c0e4a207 trailing newlines 2020-05-02 11:00:50 +02:00
datlo dfc1fc3e53 oops honk 2020-04-04 13:36:12 +02:00
datlo 4ea7f8dce9 Silencio 2020-04-04 13:04:14 +02:00
datlo 4db33fce5d review stuff + mute in magic mirror 2020-03-26 16:14:25 +01:00
datlo 25bece7933 remove italics, add combat gloves 2020-03-26 10:52:12 +01:00
datlo 61adc6abb9 Add wizard loadouts 2020-03-22 12:32:51 +01:00