Commit Graph

59 Commits

Author SHA1 Message Date
SabreML 678435d50a Blood Cult 2: Electric Boogaloo (#14516)
* 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: #14393
Fixes: #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>
2020-11-06 20:41:41 -05:00
farie82 242e8054d0 Fixes spell buttons flickering and more fixes (#14630) 2020-10-17 00:28:11 -04:00
mochi 455a854981 Fix action button rendering bugs 2020-10-06 11:41:54 +02:00
mochi 81f5fd176d Merge branch 'master' into client-hud-consistency 2020-10-04 20:59:52 +02:00
SabreML b73fc0c29b Adds a 'Clear Scanner Records' action for Forensic Scanners (#14274)
* Adds clear_scanner as a verb

* Changed 'spawn()' to 'addtimer()'.

Also made the 'ding' sound a bit quieter.

* Some 'attack_self()' refactoring

* Some 'print_scanner_report()' refactoring

* Some 'scan()' refactoring

* Changes 1 & 0 to TRUE & FALSE

* and the rest of them

* Review fixes

Moved 'lowertext()', removed implied src,
changed '\the [target_name]' to '[A]'.

* Changed 'clear_scanner' from a verb to an action

* Made 'print_forensic_report' its own action

Don't want reagent scanners getting the same icon

* More cleanup
2020-09-19 23:04:07 -04:00
farie82 915e0913a9 Make spell buttons light up slowly when recharging (#13200)
* Make spell buttons light up slowly when recharging

* Recharge percentage

* whoops
2020-09-16 15:41:02 -04:00
mochi f1b7e9f7cc please just end my life 2020-09-14 20:15:09 +02:00
mochi fa9eb84c8b Address AA 2020-09-14 19:58:18 +02:00
mochi 7e3fb680c0 Headphones, fix unreachable dropoff threshold, etc. 2020-07-22 17:50:30 +02:00
mochi 24e8cd66ac Port Baystruments PR from tgstation 2020-07-17 15:18:17 +02:00
mochi 1d316dfcb0 Address farie 2020-07-06 19:22:54 +02:00
mochi a96d2d2d38 Merge branch 'master' into client-hud-consistency 2020-07-06 19:20:15 +02:00
mochi 5198bed3b8 overlays.Cut() -> cut_overlays() (take 3) 2020-06-16 09:30:12 +02:00
Fox McCloud 75a8efa65c Updates Components (#13594)
* Updates Components

* signal documentation too

* minor fixes
2020-06-15 18:18:07 -06:00
mochi 0e81b24a45 No red cross, just darken action button 2020-06-15 09:35:36 +02:00
mochi 0e9cfc6d60 Make UI settings apply consistently
HUD alpha, color and style settings should
now apply to all HUD elements consistently
Actions that cannot be performed now display
a big red cross to make it obvious
Clean up some code when possible
Fix intent selector using the HUD color setting when it shouldn't
2020-06-15 01:04:35 +02:00
Fox McCloud 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
Fox McCloud 52b37935f7 commit 2 2019-08-11 23:23:43 -04:00
Fox McCloud 39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
variableundefined 74a7b7ad55 Merge pull request #11566 from Arkatos1/locked
Action Buttons - Lockdown
2019-07-09 18:22:40 +08:00
Arkatos1 fb8313308e added action button ability to lock or unlock them in place 2019-05-21 22:44:54 +02:00
Mark van Alphen 2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
2019-05-08 21:40:35 +02:00
Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen 429dd20ded Button plane fix 2019-04-23 20:08:04 +02:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Arkatos1 52a051f7e9 Code improvement 2019-04-05 20:13:13 +02:00
Arkatos1 a364d2d032 Descriptions now shows with mouse hover over action buttons 2019-04-05 20:11:41 +02:00
Mark van Alphen f75de97c6e Port over Corn and affected's work on Lavaland
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
2019-04-01 23:41:32 +02:00
variableundefined 4de3d741a5 Merge pull request #10449 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/let-there-be-light
fixes lightning
2018-12-13 09:37:58 +08:00
Joe Schmoe 3a7e06960a fixes lightning 2018-12-12 22:40:45 +01:00
variableundefined 2f73a6ecb1 Merge pull request #10390 from MarsM0nd/Radial_Implants
Radial menu for implants and item_action icon.
2018-12-11 20:37:45 +08:00
Mars 7841d851f6 Item_action customizing icon + custom icons for arm implants 2018-12-01 13:42:38 +01:00
Citinited 6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
Citinited 88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
Citinited 05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
tigercat2000 6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
Crazylemon64 cbd52db2be A couple buildmode fixes
The runtime when not placing a valid path is now replaced with a warning
message

The HUD icon for buildmode is no longer covered up by item actions
2018-07-26 21:47:40 -07: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
alexkar598 ad97972038 Adds a var to not use item icons and insteed use the icon supplied in the subtype,defaults to using the item icon.Also removes empty file 2018-03-22 16:19:38 -04:00
Fox-McCloud d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
Fruerlund 7b7fcf643a Adds action buttons
The chem scanners will now use action buttons instead
2017-05-22 11:08:43 +02:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
KasparoVy 3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
KasparoVy 9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
Markolie f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +02:00
Markolie 52355cba9d Added Legion megafauna, updated weather and some minor other refactors/changes. 2016-10-24 02:16:45 +02:00