Commit Graph

335 Commits

Author SHA1 Message Date
dearmochi 6ecc3d5234 Add ability to swap items in storage (#13648)
* Add ability to swap items in storage

Add ability to swap items in storage through
drag and drop
Fix "the the" message when putting item in storage
Clean code where possible

* Fix swap in stacked storages, clean up code (v3)

* Ignore restraints and lying for swapping items

* Clean up the code a bit, increase readability

* Clean up code, remove spawn(0)

* Fix some spacing issues

* Rename var, use crisp font
2020-12-22 16:15:40 -05:00
AffectedArc07 8aa038c31b Merge pull request #14853 from SabreML/Cult-Radial-Menus
Adds radial menus to cult structures and constructs
2020-11-15 09:31:19 +00:00
SabreML 57d5d12599 Drunk alert 2020-11-11 03:08:45 +00:00
SabreML 27903691ca Adds radial menus 2020-11-09 00:34:13 +00:00
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
SabreML fe8e82162c Bola exploit fix (#14821)
Also makes holding 'Alt' change the toggle icon.
2020-11-04 15:36:22 -05:00
Kyep 55a8825703 Revert "Fix eyeblur runtimes"
This reverts commit a416e8efdb.
2020-10-12 07:10:56 -07:00
AffectedArc07 a50f656d8d Game Preferences Update (#13936) 2020-10-09 14:53:59 -04:00
AffectedArc07 7f57108434 Merge pull request #14531 from FlattestGuitar/eyes-wide-blurred
Blurry eyes blur eyes
2020-10-06 08:34:11 +01:00
mochi 81f5fd176d Merge branch 'master' into client-hud-consistency 2020-10-04 20:59:52 +02:00
FlattestGuitar 6261a7d8da blurry eyes blur eyes 2020-10-04 14:47:53 +02:00
mochi 324e053c1a Merge branch 'master' into fix-ghost-poll-chat-signup 2020-09-29 15:08:16 +02:00
Dovixx b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
AffectedArc07 a896bc825f [TGUI] Camera Consoles (Actual Magic) (#13750)
* TGUI Camera Consoles

* inb4 I fail my own CI routines

* Makes it so AIs cant use cam consoles

* Refactors camera bugs
2020-09-19 09:55:33 -04:00
AffectedArc07 a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul
Overhauls and Refactors Alarm System
2020-09-14 13:54:06 +01:00
mochi 32d0c6cd28 Add eligibility checks for pAI observer button 2020-09-04 20:15:34 +02:00
mochi 8e724db299 Fix unusable "sign up" chat btn when ghost polling 2020-09-01 12:44:40 +02:00
Qwertytoforty 5563f3b834 Makes guardians not able to call manifest when manifested 2020-08-29 11:29:19 -04:00
mochi 312932e70a Keep zone selection doll discolored 2020-08-23 20:17:44 +02:00
mochi cc215f9313 Merge branch 'master' into client-hud-consistency 2020-08-23 19:33:11 +02:00
mochi d060e8bc43 Fix offspring candidacy icon, pref checks and add chat message 2020-08-23 13:26:44 +02:00
mochi 3509a3ed22 crisp maptext 2020-08-12 01:43:49 +02:00
mochi 25fa3f23cf Merge branch 'master' into overhaul-event-mob-selection 2020-07-20 07:01:11 +02:00
mochi d0be92103f Merge branch 'master' into client-hud-consistency 2020-07-13 10:31:00 +02:00
Fox McCloud 85abb6505b Merge remote-tracking branch 'upstream/master' into alarm-overhaul 2020-07-10 15:05:37 -04:00
Fox McCloud 5b09a6a1f0 Merge pull request #13697 from dearmochi/fix-off-center-observer-hud
Add pAI and Ghost Spawns buttons for ghosts
2020-07-10 02:34:18 -04: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
Fox McCloud f13ae9e167 Overhauls and Refactors Alarms 2020-07-01 17:41:47 -04:00
mochi f37f73ef80 Minor fixes and clean up 2020-06-29 01:52:18 +02:00
mochi f547c4d497 Overhaul event mob selection
Create the SSghost_spawns subsystem which serves as the subsystem for polling candidates for a special role. On the outside it works the same as /proc/pollCandidates but unifies everything so that event mob candidacies are a consistent experience
2020-06-28 00:54:54 +02:00
mochi f58af87fd5 Remove 1px offset 2020-06-26 20:19:42 +02:00
mochi 73b577c516 Add mob spawner and pAI button in toggleable list, re-center 2020-06-26 20:11:39 +02:00
mochi e5dc7e5591 Fix off-center observer HUD 2020-06-26 14:48:41 +02:00
Fox McCloud b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
mochi 65d0ecaed3 Optimize memory usage by eliminating/changing some lists
Ported from TG: Object armors are no longer defined in (unique) lists but rather datums that can be cached depending on their armor values.
Add LAZYSET define to lazily initialize a list then assigning a key to a value
Add alldirs2 global which is the same as alldirs except diagonals go first
Optimize mob memory by making alerts list lazy
Optimize obj/machinery memory by making use_log and settagwhitelist lists lazy
Optimize atom memory by not creating hud_list list for all atoms
Optimize turf memory by not creating footstep_sounds list for all turfs
Clean up code where possible
2020-06-22 00:46:14 +02:00
mochi 5198bed3b8 overlays.Cut() -> cut_overlays() (take 3) 2020-06-16 09:30:12 +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 70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -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
joep van der velden 3c00df376a inventory slot tweak
Clicking on an inventory slot now uses the item there first then tries
to equip
2019-12-17 17:11:40 +01:00
unknown a847938324 merge with master 2019-12-14 00:58:40 -05:00
Fox McCloud 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Coul 3554c78e6b make 513 compile 2019-10-17 20:48:25 -04:00
Fox McCloud 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Fox McCloud cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00