Commit Graph

502 Commits

Author SHA1 Message Date
AffectedArc07 b797f85a49 Fixes bad area pathing on all the lava ruins (#15108) 2020-12-16 14:41:15 -05:00
AffectedArc07 a4bb84fc6d SSticker minor refactor (#15089)
* SSticker minor refactor

* Even the experienced make mistakes

* tiny lil bandaid

* Oops

* Update code/controllers/subsystem/ticker.dm

* Adds this
2020-12-16 14:05:10 -05:00
dearmochi 5edee29a50 [READY] Syndicate Contractors (#14605)
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
2020-12-09 12:03:23 -05:00
AffectedArc07 6654642468 Removes old, unused area stuff (#14967) 2020-11-25 23:53:59 -05: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
ExusA 8837621dfb redo redo again (#14829) 2020-11-06 13:37:22 -05:00
Samuel c99f7e3b22 Boo! Rework (#14543)
* Boo Refactor

* Boo-Refactor Review Items

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

* Vending Machines Flicker

* Dave's Fire PR Review Mixtape Ft. SteelSlayer

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-26 19:57:02 -04:00
AffectedArc07 f40a8163ff Codebase Cleanup - 2020-09-27 (#14472)
* Codebase Cleanup - 2020-09-27

* Endings

* Forgot meta

* Farie Tweaks
2020-10-15 13:22:52 -04:00
AffectedArc07 b778fbe069 Removes Aurora Caelus (Green space) event (#14575)
* Removes Aurora Caelus (Green space) event

* Steel Tweaks
2020-10-14 16:22:53 -04:00
AffectedArc07 561db683ad Merge pull request #13869 from Fox-McCloud/intercom-refactor
Refactors Intercomms For Less Processing
2020-10-04 18:37:24 +01:00
SteelSlayer 01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196)
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 13:31:16 -04:00
SteelSlayer dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05: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
Fox McCloud e6bd4b6638 fix ups 2020-09-13 18:33:21 -04:00
SteelSlayer d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
Fox McCloud 6744e281a2 styling fixes 2020-07-22 17:19:45 -04:00
Fox McCloud 7585a2060b Refactors Intercomms For Less Processing 2020-07-17 15:50:52 -04:00
Fox McCloud de0c606969 Merge pull request #13502 from AffectedArc07/hook-kill-v10-final-ultimate-final
HOOKS ARE DEAD
2020-07-13 13:55:04 -04:00
Fox McCloud 48fbdda84b Standardizes Holodeck (#13701)
* Standardizes Holodeck

* fixe and real space

* last errors

* map update

* fix

* console fix

* mapping error
2020-07-12 14:25:08 -06:00
AffectedArc07 390e41e91d The elephant: Ruin + Whiteship rework (#13632)
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
2020-07-12 13:44:58 -06:00
AffectedArc07 014dbd95d9 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-12 09:27:33 +01:00
Fox McCloud cc96e93bf3 fixes 2020-07-11 15:48:47 -04:00
Fox McCloud 2fb2fe99f8 centralized alarms 2020-07-11 13:56:11 -04:00
AffectedArc07 650c638d41 Removes semicolons 2020-07-11 18:51:45 +01:00
Fox McCloud 729e9b8922 soft refs 2020-07-10 18:41:37 -04:00
Fox McCloud b7bcf49c6e I win, Baycode, I win 2020-07-02 11:27:02 -04:00
Fox McCloud cfe345a8f6 final fixes 2020-07-02 09:32:12 -04:00
Fox McCloud 2fa1217d5c styling 2020-07-02 08:34:59 -04:00
AffectedArc07 748b8e88e1 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-02 11:17:30 +01:00
Fox McCloud 86cc4b49ae fixes 2020-07-01 19:45:54 -04:00
Fox McCloud f13ae9e167 Overhauls and Refactors Alarms 2020-07-01 17:41:47 -04:00
Fox McCloud 4ebc2070e1 Updates Ship Ambience (#13635)
* Updates Ship Ambience

* derp

* removes traitor.ogg

* remove unused

* leave it in, but don't compile it in

* styling
2020-06-28 15:18:37 -06:00
AffectedArc07 d8c29ad493 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-06-27 10:10:13 +01:00
AffectedArc07 a237d90f0f Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-06-26 12:30:43 +01:00
Fox McCloud d09624a1ae Merge remote-tracking branch 'upstream/master' into remove-construction-site 2020-06-23 05:01:38 -04:00
Fox McCloud c8a7607129 Purges a Bunch of In World Calls (#13641)
* Purges a Bunch of In World Calls

* tweaks and fixes also typeless lists

* typeless

* fixes

* tweak
2020-06-22 06:56:19 -06:00
Fox McCloud 602a018bc5 fixes 2020-06-18 11:12:58 -04:00
Fox McCloud 27e709278e Removes Construction Site 2020-06-17 20:43:15 -04:00
AffectedArc07 1676db7924 HOOKS ARE DEAD 2020-05-27 12:00:16 +01:00
AffectedArc07 4e56bfdad0 Fixes this 2020-05-16 15:56:42 +01:00
AffectedArc07 c76ffe6bde Maps stuff back in 2020-05-15 21:43:59 +01:00
joep van der velden 4c0098b9df Makes ai_monitored load the cams on LateInitialize 2020-04-27 21:53:59 +02:00
AffectedArc07 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -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
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
Kyep dfd83d822a Depot Fixes & Tweaks (#11677)
* Depot Fixes & Tweaks
2019-09-16 22:55:54 -04:00
datlo 068b997eb6 Final
Add cabin area to avoid the alarm locking the entire biodome
Prevent crowbarring lubed tiles in clown planet
Added a few walls to prevent the disposal entrance immediately throwing
you into lava
2019-08-27 14:34:27 +02:00
Tayyyyyyy e49d77b953 Update shuttle directions 2019-08-19 21:29:25 -07:00
Tayyyyyyy 4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00