Commit Graph

22725 Commits

Author SHA1 Message Date
AffectedArc07
78a35949e5 Merge pull request #14849 from SabreML/more-cult-stuff-v1
Cult fixes the 2nd
2020-11-15 21:54:44 +00:00
AffectedArc07
8322be2039 Merge pull request #14749 from dearmochi/fish-qol
Aquarium QoL: Fish bag, lower hunger rate and more
2020-11-15 21:42:36 +00:00
AffectedArc07
27b1c4fd29 Merge pull request #14855 from moxian/hud
Skills HUD now shows job icon, and other minor HUD improvements
2020-11-15 09:28:43 +00:00
AffectedArc07
435ddb992e Merge pull request #14872 from SabreML/Detective-badges
Allows Detectives to get a holobadge from the loadout
2020-11-15 09:26:16 +00:00
AffectedArc07
fac10210ed Merge pull request #14880 from matttheficus/replace_gatfruit
Swaps Gatfruit with Red Glowcaps @ Lavaland Terrarium
2020-11-15 09:22:24 +00:00
SabreML
f2261c6d81 Review stuff 2020-11-14 17:22:50 +00:00
AffectedArc07
fb7c30434a Merge pull request #14873 from Stokes52/motorcycle_jacket
Add new leather motorcycle jacket
2020-11-13 21:52:33 +00:00
Stokes52
91be65338b Change numbers to booleans 2020-11-13 13:34:25 -08:00
matttheficus
761c42161b swaps gatfruit with red glowcaps 2020-11-12 14:32:31 -05:00
AffectedArc07
96d4d6f265 Merge pull request #14869 from SabreML/drunk-alert
Adds an indicator alert for voice slurring
2020-11-12 12:32:52 +00:00
AffectedArc07
36d46df30a Merge pull request #14875 from meow20/fixcandle
Fixes empty candle box in loadout
2020-11-12 09:52:29 +00:00
meow20
788eac4392 Update loadout_general.dm 2020-11-11 22:23:20 +01:00
AffectedArc07
4d2cee9844 Makes gray terror webs slightly more visible (#14866) 2020-11-11 15:39:09 -05:00
SabreML
72432af131 Holobadges for the Detective 2020-11-11 19:13:54 +00:00
Stokes52
8ee879fcdb Add new leather motorcycle jacket 2020-11-11 11:06:06 -08:00
AffectedArc07
2c328108a0 Merge pull request #14838 from kugamo/HOP-no-ticket
Ticket-Machine enable/disable ability.
2020-11-11 15:34:34 +00:00
SabreML
57d5d12599 Drunk alert 2020-11-11 03:08:45 +00:00
SabreML
beefe9e2d0 Update dog.dm 2020-11-09 10:29:58 +00:00
moxian
a1825a6cdd Formatting. 2020-11-09 06:57:36 +00:00
moxian
7069268be9 Minor HUD improvements
- skills HUD now shows assigned job
- adding security/medical comments works
- employment records no longer span five screens, and are trimmed
instead.
2020-11-09 06:07:20 +00:00
SabreML
c6fb656d5a Various fixes
Changes:

Cult rise/ascension works properly now,
Cult constructs now show as antagonists in admin logs,
Manifested cult ghosts are now properly deconverted before being dusted,
Admin culting someone during a non-cult round now works properly, and sets up cult objectives and thresholds (Hopefully, anyway)

Also removed a couple of unused procs
2020-11-08 17:38:00 +00:00
DMAPI Update
e2aea3d21d Update TGS DMAPI 2020-11-08 00:28:15 +00:00
E-MonaRhg
68afb726b3 CC clothing armor buff + description and name changes (#14803)
* CC clothing armor buff + description and name changes

* Small change in blueshield's uniform description

* NTR's hat name and description change

* Fixed spacing issues with "energy"
2020-11-07 16:51:13 -05:00
Qwertytoforty
6a7456ae1f Adds Brute / burn mod to borgs (only syndicate for now) and gives syndicate borgs 5 damage reduction (#14818)
* Adds Brute / burn mod to borgs (only syndicate for now) and gives syndicate borgs 5 damage reduction

* But what if it had documentation

* Autodoc

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

* Update code/modules/mob/living/silicon/robot/syndicate.dm

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

* Steels other suggestion

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

* Henks stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
2020-11-07 16:50:40 -05:00
joep van der velden
6cc5bf1120 Re adds ticket conversion via the chat link. Minor tweak to formatting 2020-11-07 22:34:26 +01:00
AffectedArc07
56752b0e78 SShttp + SSdiscord | ASYNCHRONOUS STUFF IN BYOND! (#14762)
* SShttp + SSdiscord | ASYNCHRONOUS STUFF IN BYOND!

* Cleanup

* HTTP Callback example

* Fixes rust instability

* More refactors

* This works

* The sanitizer (Now worth £3000)

* New configs + other stuff

* Lets give this a shot

* Farie changes

* Mentor support

* Farie fixes
2020-11-07 11:57:47 -05:00
Kugamo
7a01f41093 OK last change to OFF coloration, I make it RED 2020-11-07 10:25:19 -06:00
Kugamo
a7052b425b makes OFF color more legible 2020-11-07 10:13:48 -06:00
Kugamo
32747fb19e Many small improvements
Thanks Farie82, AffectedArc07
2020-11-07 09:51:47 -06:00
joep van der velden
a36511a3a8 PR review request changes 2020-11-07 10:39:01 +01:00
AffectedArc07
324d7e3ab5 Merge pull request #14823 from Qwertytoforty/fuck-off-with-the-chems
Adds some flaming hot logging
2020-11-07 09:31:37 +00:00
AffectedArc07
d3a99effbc Merge pull request #14822 from SabreML/bola_walking
Makes removing legcuffs toggle movement intent back to 'Run'
2020-11-07 09:30:46 +00:00
AffectedArc07
f2b2625b06 Merge pull request #14814 from dearmochi/auto-highlight-codewords
Auto-highlight code words, add "View code words" secret
2020-11-07 09:27:18 +00:00
AffectedArc07
7a50931b92 Merge pull request #14806 from farie82/disposals-force-eject
Implements force_eject_occupant for disposal units. Allowing disposaled SSDs to be cryod
2020-11-07 09:26:57 +00:00
Kugamo
2c177c102f undos negative variable, and makes rejection message when using bad ID better 2020-11-07 00:09:46 -06:00
Kugamo
5360b775e2 makes varible names and X gooder
Thanks Moxian
2020-11-06 23:44:53 -06:00
Kugamo
7c9bbea756 makes disabled display an 'X'
I thought it just being blank could be confused to be broken.
2020-11-06 23:14:37 -06:00
Kugamo
cc741c2ed3 Base functional CODE 2020-11-06 22:55:32 -06: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
Qwertytoforty
83267f45d6 Steel and henks stuff 2020-11-06 17:49:01 -05:00
AffectedArc07
023ceea8ca Merge pull request #14755 from farie82/floor-cluwne-fixes-tweaks
Floor cluwnes fixes. Can't hide in lockers no more + limits the speed of stage changes
2020-11-06 09:42:40 +00:00
AffectedArc07
fc007fd7e5 Merge pull request #14832 from moxian/orbit-nuke
Re-add misc places of interest (such as nuke and NAD) to the orbit menu.
2020-11-05 20:57:37 +00:00
moxian
e0dc9bf134 Re-add misc places of interest to the orbit menu. 2020-11-05 20:48:04 +00:00
moxian
cad44153a9 Fix Orbit menu BSOD (#14828)
* Probably fix orbit menu BSOD

* Also add a check to js

* Add a stacktrace
2020-11-04 22:44:35 -05:00
Qwertytoforty
b83a134d6b Removes un-needed holder 2020-11-04 19:54:35 -05:00
Qwertytoforty
176f5d8805 Procs it, un-more's it, sticks it in a stew 2020-11-04 19:30:17 -05:00
moxian
1f0156a780 Observer Orbit menu is now fancy TGUI (#14810)
* Observer menu is now fancy TGUI

* Review comments.

* Actually, let's show more of the antags in the selection.
2020-11-04 18:37:44 -05:00
Qwertytoforty
f091f5c4d8 Adds some flaming hot logging 2020-11-04 18:32:47 -05:00
SabreML
0f06271565 Update carbon.dm 2020-11-04 20:43:40 +00:00
SabreML
fe8e82162c Bola exploit fix (#14821)
Also makes holding 'Alt' change the toggle icon.
2020-11-04 15:36:22 -05:00