* 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>
* 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>
* Updates Mechafauna sprite
Initial change from old sprite to new sprite
* Updates to add back in breath sprites
Breath sprites were missing from the original effects file. This adds those back in.
* chilly
* frosty
* Now with crawling and buckling!
had to do some jank because meat spikes dont change a perfectly good variable that other angle changing code uses, so insert snowflake code for the meat spike. :C
* Fixes warning
what the hell is a protected variable anyways
* amogus
* Revert "amogus"
This reverts commit ebaa99c77b.
* megafauna PR deconflict
* removes jank
* needless variable def
* 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>
* basic functionality
* map edit: delete mother from awaymission
* IncubateEggs, PickupSpiderlings, anti-exploit stuff
* editor, please stop messing with my indentation
* fixes
fixes: stops "cancelled" messages when a terror is in an airless pipe, stops incubate being used on eggs on an adjacent tile, makes the "cannot incubate due to lack of regen points" message clearer, stops spiders using remoteview while in a pipe which messes up their vision
* fixes being able to wrap spiderlings/etc into coccoons if they're on top of a dead body
* mother webs block spiderlings from passing them
* AA suggestion
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* DMI files
* Progress
* we compiling
* innate cult action, various progress
* Reorganise runes, fix cult dagger action and admin cultist
* Cult tooltips, dagger icons
* Add mirror shield, return runes back to OG circles
* Cult structure lights, pylon update
* bola update, progress..
* cleaning rune fix, girder/structures anchor
* speed up cult walls
* Convert rune update, tweaks
* Add teleport portals
* fix runtimes
* cult objs start
* move current cult objs to backup
* Rework cult objectives, add narsie/singulo interactions
* spacing, admin log and message
* reviewstuff
* refactor cult conceal/reveal
* add a bit of range to reveal
* blood magic tweaks, hallway not in summon areas
* implement structure concealment, offer uncuff
* add parry sound, fix cult airlock reveal appearance
* Update remaining runes
* fix pylon blood restaure, up blood magic cost
* review tweaks and progress
* fix compilation
* fix offering rune bug
* Draw blood rune action refactor
* moar tweaks
* fixes, holy water blood magic clean, icons
* Add cultist hardsuit, tweaks
* reduce needed pylons for cult ghost, cult shield
* spirit realm fixes
* fix dark spirit
* Add blood rites
* exotic blood handling
* spacing, add adminbus dagger, bal. rune health cost
* woops
missed a var
* fix blood rite healing
* emp spell cult immunity
* fix exploit and narsie references
* new rune sprites
* color defines
* SEND_SOUNDS, cult summon areas
* fix soap, barrier, and add CC location on narsie
* cult structure fix
* functional ascendance, undo cult spacesuit changes
* woops
* whetstone qdel, tweaks
* fix empty area selection bug
* cult ascendance numbers
* add cult blade sprite, add sacrificing head/brains
* review stuff
* fix runtime and twisted cons target
* review stuff
* code clarity
* remove unnecessary cultist checks
* Add support for wizard cultists
* cleanip
* fix concealed glass airlocks
* update objs
* remove talisman ref
* fix status procs
* clarifications, remove unnecessary var
* deconflicting
* deconflicting LF
* oops
* readd new icons
* more conflcit stuff
* readd drill and jaws icons
* review stuff
* silence on conversion
* Readd compact sniper icons
* Remove ambiguity
* 2 sacrifices required
* check antag panel improvements, bug fixes
* limits narsie cult ghost cheese
* CC message
* trailing newlines
* Shade/construct update
* bug fixes
* balance bloodboil, update CC message
* add a newline to something i didnt touch
idk ask travis bout it
* remove metastation extra null rod and shard
* fix teleport runes list, update icon
* remove tg cultist icon
* update cult actions with new tome
* Remove mirror shield throw, spell constructs
Add in sacrificing any brain with a mind.
* Fix more conflicts
* Fix double return
* Add descriptions to cult recipes, fix icons
* fix shuttle curse exploit
* Update wall rune, cult shields, runed recipe width
* implement flagellant sprites, misc changes
* Fix conversion rune
* Add cult blood barrage healing
* Trailing line
* fix whitespace
* Remove can_speak check on invoke
* Deconflict pt. 2
* Bugfixes the 1st
Fixes bugs 2 and 4 in the 'Known Issues' section
* cult.dm tweaks
Oh boy, even more commits!
* Fixes blood halberds swapping directions on wield
* Tweaks and stylin'
Changed a few span classes around and added a 'Remaining Charges' display to the Blood Rite spell
* Ritual tweaks (And some other stuff)
Fixes:
Altar stray pixel,
Using 'Twisted Construction' on a cult door,
Rune drawing checks,
probably more idk
* Rune tweaks & fixes
Fixes:
Wraith glowing not turning off while jaunted,
A MASSIVE oversight by me with playsound(),
probably also some other stuff but I've been staring at this file for a week and I've forgot most of what I did.
* Testmerge fixes the 1st
Fixes:
Ascendent is now Ascendant,
The Cultist greeting is now in the correct order,
IPCs now draw oil coloured runes,
No longer able to sacrifice a body multiple times,
Sacrificing a brain or head now gives a soul shard,
Converting an IPC or someone with robotic limbs now heals them correctly,
Probably more.
* Mirror Shield balancing
Being hit by a projectile above a damage threshold (10) now increases the chances of the mirror shield shattering, by 3% per damage point.
This may seem pretty low, but an Energy Gun would have a 30% chance of breaking the shield per hit. (Assuming I did this right, anyway.)
* Insect repairs and more
Changes:
Makes the shuttle curse lines a define,
Comments out the changing construct names,
Made flagellant robes block hair,
Added documentation to the mirror shield (See said documentation for details),
Made the cooldown examine text for cult structures display minutes and seconds,
Removed the ability to sacrifice the same body multiple times,
Cleaned up the soulstone code (and hopefully didn't break anything),
Probably still missed something, oh well!
* Rune opacity and Stun timing
Changes:
Halved all the values of the 'Stun' spell, since it was presumably an oversight. (20 second stun to 10)
The 'mouse_opacity' for runes has been set to 'opaque', this means that clicking on any spot on the tile will select it. (Less fiddly)
The '(REMOVE SPELL)' choice when choosing spells now only shows if there's any spells to remove.
Dunking someones head in the lava forge now only works if they have a head.
Also fixed a whole bunch of typos/gramatical errors.
* Blood Boil, Blood Barrage and EMP Sprites!
Changes:
Overhauled the 'Blood Boil' rune (See documentation)
Added in-hand sprites and red sparks for 'Blood bolt barrage'.
The nar'sie rune now removes all runes around it to prevent clipping.
Fixed runtime when examining the 'Arcane Barrage' spell.
Added new sprites for the EMP spell, courtesy of @kugamo!
Co-Authored-By: Kugamo <thekugamo@gmail.com>
* A few more tweaks
Changes:
Halved the percentages of 'Rise' (Glowing eyes) and 'Ascend' (Halos) to 10% and 20% respectively.
Hopefully fixed shield walls being passable while active.
Changed "Nar-sie" to "Nar'sie" in a few places.
* TM 2 fixes
Changes:
Teleport runes now only show the user when the animation has finished.
Cult shields are now invisible to ghosts when disabled.
Crayon runes now use the new rune sprites.
Construct night vision now actually works.
You can no longer soulstone yourself.
The death message for cult structures is now bigger.
Cult objectives are now displayed at roundstart.
Tweaked the icons for artificer spells.
Tweaked some cult related 'Tip of the round's.
Summoned cult ghosts no longer show in the 'Check Antagonists' panel when dead. (Hopefully)
* Cult members and Deconversion
Changes:
Using the 'Study the Veil' ability now shows how many members the cult has.
Holy water now unequips all cult clothing on deconversion. (Flagellant robe, blindfold, etc.)
Nar'Sie no longer warns admins that it doesn't have a containment field.
Fixed Zealot's Blindfolds not temporarily blinding any non-cultists who touch them.
The 'Summon Cultist' rune description now explains that restrained cultists cannot be summoned.
Fixed Travis (Probably)
* Cult Rise/Ascend balancing V1
The values here will almost certainly need some tweaking, but I feel like it's better than it was before; and certainly more customisable.
* Possibly maybe hopefully (one of) the last commits
Changes:
The cult halo no longer vanishes on relogging.
It's now possible to drag things on to runes again.
* A few minor fixes, and a major one
Changes:
Resetting your action button positions no longer completely breaks blood spells.
The downside to this fix is that Blood spells can no longer be moved around, so sorry sorry about that.
Fixes: #14393Fixes: #13855
* New weapon sprites!
Adds fancy new sprites for all cult daggers and swords, courtesy of @McRamon!
They will need adjustments for Vox and Kidan at some point, and the Skrell inhand can look a bit odd at times, but those are also problems for every other weapon in the game so that can be fixed later.
Co-Authored-By: McRamon <31545294+McRamon@users.noreply.github.com>
* TM 3 fixes
Changes:
Fixed action button related bugs, including making them movable again! (probably caused a bunch more but eh),
Slightly tweaked threshold for ascendance,
Blood Rites now cleans up slime blood,
The Deconversion message is now bigger,
Flagellant robes now take 5% more damage (Lasers do 30 damage rather than 29),
Teleport runes can no longer be erased while a portal effect is open,
Teleport rune portals now always show the Z-Level if they're not in station space,
Teleporting another player no longer makes you temporarily invisible,
Attempting to summon a restrained cultist now gives said cultist a warning message,
Fixed a runtime when placing a soulstone in a construct,
Cultists now show on the Orbit menu if you have AntagHUD enabled,
Fixed a few typos
Co-authored-by: datlo <quentinkoyote@gmail.com>
Co-authored-by: Kugamo <thekugamo@gmail.com>
Co-authored-by: McRamon <31545294+McRamon@users.noreply.github.com>
- Survival pod storage being broken when used.
- Wrong wiring on the Syndicate base.
- Added one more oxygen tank to the animal hospital.
- Chasms eating up light atoms.
- Mining satchels not picking up items automatically.
- Releasing the legion/blob mice notifications not having icons.
- Mining gear made orderable at cargo.
