Commit Graph

400 Commits

Author SHA1 Message Date
AffectedArc07 f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
AffectedArc07 1843266a4a Makes syndicate depot structures Initialize() (#15120) 2020-12-16 15:08:32 -05:00
moxian 388b69d78e Deletes CLICK_CD_BREAKOUT. (#14992)
There's no reason to prevent people from *clicking* on things
for 10 seconds. They won't be able to do anything useful while being
constrained anyway.
And also, all paths leading to CLICK_CD_BREAKOUT go through
CLICK_CD_RESIST, so this change effectively lowers the "can't click
anything" time from 10s to 2s (not to zero)
2020-11-26 09:44:37 +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
Kyep 995165ae38 fixes merge conflict 2020-09-15 11:39:00 -07:00
SteelSlayer f0fd61bb0d Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-09-10 17:20:35 -05:00
SabreML d33561bea9 Alt clicking now locks/unlocks lockers 2020-09-04 05:09:56 +01:00
Kyep e3b82a70a3 Replaces skills computer with skills HUD eyewear 2020-08-17 06:02:55 -07:00
SteelSlayer 7b6b9e8ddd Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-07-03 14:34:22 -05:00
Fox McCloud 93db61665d Speech bubble refactor and Features (#13598)
* Speech Bubble Update and Refactor

* OBJECTION

* magistrate too

* args

* clean up and plug in atom say

* better
2020-06-28 14:23:32 -06:00
farie82 9f49a42d15 Refactor closet and RCS code. Can't put items in closets on modes other than help (#13464)
* Refactor closet and RCS code. Can't put items in closets on modes other than help

* Undef

* Styling tweaks

* Github reviews and extra

* glob.machines
2020-06-26 02:24:35 -06:00
SteelSlayer 2c08ce843f personal locker fix 2020-06-08 22:33:29 -05:00
SteelSlayer 973e53be14 nevermind this should go after 2020-06-06 10:04:46 -05:00
SteelSlayer 158c4e241e fix 2020-06-06 09:55:09 -05:00
SteelSlayer a508b42b4e IPC balance changes 2020-05-15 03:44:55 -05:00
Fox McCloud c87e4bd5c7 Merge pull request #12950 from Aquilar/blueprintpinpointerfix
Fixes steal station blueprints objective
2020-05-01 18:36:08 -04:00
AffectedArc07 928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
Aquilar 898ca53e71 deconflict
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-18 15:09:43 +08:00
Aquilar 25102492c0 Merge branch 'master' into blueprintpinpointerfix
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2020-03-18 15:06:19 +08:00
Mitchell 8e75487346 Fixes CLRF 2020-03-17 17:43:11 -05:00
Mitchell 230e3d8abc Merge branch 'master' into adddefibs 2020-03-17 17:26:29 -05: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
Mitchell a65bb8e1e6 Zap Zap 2020-03-14 15:21:50 -05:00
Aquilar fa84366203 Added an icon to differentiate the blueprints from the CE's blueprints. purely to prevent confusion.
Fixed the pinpointer from pointing to cyborg and slime blueprints by;
Changing the steal objectives to require the CE's copy of the blueprints exclusive. Which required changing few lines in various places that reference that specific copy.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

missed the line in photography.dm
2020-02-01 19:06:03 +08:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
variableundefined 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud 67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud 5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -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
MrMagolor 80bb221891 Adds an ATMOS Holofan Creator to the Chief Engineer's locker (#12419) 2019-09-26 16:59:20 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud 42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
variableundefined b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
Fox McCloud 9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined 722df75be4 Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
Fox McCloud 0b46603e38 Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
Adds a handheld defibrillator to the paramedic EVA closet
2019-08-27 02:40:31 -04:00
Fox McCloud eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud 899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
SteelSlayer e1f4a08c54 Adds hand defib to the paramedic EVA closet 2019-08-25 00:49:02 -04:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
SteelSlayer e0a34a179b Adds destination tagger to atmos locker 2019-08-17 13:07:35 -04:00
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00