Commit Graph

68 Commits

Author SHA1 Message Date
Qwertytoforty af5d187014 Adds magic tarot cards [SERIOUS DO NOT CLOSE AFTER AFD] (#24933)
* starts it

* Update magic_tarot.dm

* MORE PROGRESS

* So many thanks to Cloudbucket, for sprites

* The Work, the Art, continues.

* more changes

* pushes the Work foward. All cards done.

* and more thanks github

* adds to BSH

* tochat

* Finishes QWERTYTODO. Magic key. World smoke

* Isaac and his mother lived alone in a small house on a hill.  Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television.  Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above.  “Your son has become corrupted by sin. He needs to be saved.”  “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life.  Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins."  “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world.  One last time, Isaac’s mom heard the voice of God calling to her.  “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you."  "Yes Lord, anything!” Isaac’s mother begged.  "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else."  "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen.  Isaac, watching through a crack in his door, trembled in fear.  Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug.  Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.

* nanny bag it before I forget

* Apply suggestions from code review

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

* returns early

* Apply suggestions from code review

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

* RE-RE-RE-REVIEW

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>

* requested changes and such

* duh

* Apply suggestions from code review

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

* returns early

* Update code/datums/status_effects/buffs.dm

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

* new hrefs here to troll CI :trollface:

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

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@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: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
2024-04-24 23:10:46 +00:00
Contrabang e32544e599 #undef is now required for all file defines (#24091)
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
2024-03-11 14:03:30 -04:00
1080pCat c78f6afe89 Adds some more guns, and removes some spells/wands from the greater summon guns and magic spell (#24056)
* Update rightandwrong.dm

* Revert "Update rightandwrong.dm"

This reverts commit 28a93bfadd.

* Update rightandwrong.dm

* forgor this one

* Update rightandwrong.dm
2024-02-14 19:44:25 +00:00
Qwertytoforty 192b8224b8 Anomaly core modules for modsuits (#23154)
* firewall

* shielded part 1

* WIP: Anomaly core modules for modsuits

* icons, vortex

* cryogrenade, nerfs teslawall

* message admins moment

* Update uplink_nuclear.dm

* rnd designs

* now uses the flayer icon state

* Apply suggestions from code review

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

* early returns, barricade types, and comments, oh my

* Apply suggestions from code review

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

* updates desc, remove comment, removes /hardsuit/

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:17:18 +00:00
GDN cf87929bec prevents people with offstation role from becoming a survivalist (#22805) 2023-10-14 20:44:28 +02:00
Samman166 491a51ecb9 Fixes a bug that allowed turret guns to be fired by mobs. (#20451)
* TRIGGER_GUARD_NONE works properly

* uses FALSE instead of 0
2023-03-13 22:13:27 +00:00
Adrer 5ad2291eba Summon Guns/Magic can no longer tries to select people who are antag banned. (#19107)
* rightandwrong no longer selects antag banned

* Most recent commit IDIOT

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-20 19:45:10 +01: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
S34N 705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

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

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
AffectedArc07 c8e9cd055a More fixes 2020-04-12 14:45:53 +01:00
farie82 604daa05e1 Adds a new logging system and a logging view (#13115)
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
2020-03-21 17:28:20 -06:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud 652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -07:00
Fox McCloud 3eb4ad0ed5 Maintainers Have No Sense of Right or Wrong (#12381) 2019-09-24 15:15:05 -07:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Mark van Alphen 0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Fox McCloud 41eb7c2476 adminbus 2019-03-30 05:15:47 -04:00
Aurorablade 4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie 2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Tigercat2000 9f3cdb43f7 special_role/objective refactor
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
2016-08-01 21:29:19 -07:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD 8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud 9ff52f91a8 Updates Summon Guns 2016-01-29 22:54:07 -05:00
Fox-McCloud 7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Aurorablade 298d55f905 Voodooyay 2015-10-11 22:40:13 -04:00
Markolie f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie 4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Tigercat2000 2b9f242659 Spellbook Overhaul; Remove rightandwrong antag making, href sanitizing
Rightandwrong will no longer have a 25% chance to make people antags,
since the spellbook overhaul makes it give a spellslot.
2015-06-07 11:04:57 -07:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Fox-McCloud 8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
DZD 5307d376da Wizard Update Part 7
(That last commit was supposed to be Part 3, not 6, but might as well
roll with it)

- Ports over the summon item spell from /tg/, it allows the wizard to
mark an item and then later recall it to his hands. If it is within
another item, that item will be recalled with the marked item inside.
- Removes RNG max charge variation on staffs, most staffs will now have
6 max charges (Rather than a 25% chance of 8, 50% of 4, and 25% of 3),
the exception being the Staff of Door Creation and Staff of Chaos, which
each have 10 charges.
- Adds summonitem to Summon Magic.
- Summon Guns/Magic now cost 1 spell slot each once again.

All ported from /tg/ with the exception of the Summon Guns/Magic cost
changes, as well as the remove of staff charge variation.
2015-01-15 17:05:49 -05:00
DZD 1c3d247aca Wizard Update Part 1
- Wands will no longer display a missing sprite if you try to fire one
while it is drained. (Only change that wasn't ported from /tg/)
- When using a staff of change on somebody, you can now turn them into a
goat or space bats, and when turning them into a cyborg, there is a
chance of that cyborg being a syndicate cyborg.
- Ports over page-based UI for the Wizard's spellbook from /tg/.
- Ports over the Wand Belt, Staff of Chaos, and Staff of Door Creation
from /tg/. The Wand Belt contains several useful wands, however all of
them have limited charges. The Staff of Chaos will cause a different
projectile spell effect each time it is cast, and can currently imitate
any of the wands. The Staff of Door creation will create wooden doors
over any solid turf they contact, doing so removes said turf.
- Mind swap will no longer remove spells from the wizard due to RNG.
- The charge spell will no longer damage the charge of weapons that
normally recharge by themselves.
- Adds Staff of Door Creation to the Summon Magic list, removes the
staff of change from the normal Summon Magic list and makes it part of
the special list
- If Summon Magic rolls to create an item on the special list, it will
create that item once, and will no longer create anything else from the
special list. (List consists of the Staff of Change, Staff of Animation,
Wand Belt, Staff of Chaos, and Contract).
2015-01-14 21:56:39 -05:00
Fox-McCloud 525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
ZomgPonies 5784cf61df Compile fixes XRAY 2014-01-21 22:38:35 -05:00
ZomgPonies ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
ZomgPonies 12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
ZomgPonies 1368fb3bfb Projectile update 2013-11-01 14:00:50 -04:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00