Commit Graph

8956 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
AffectedArc07
4da9abeb50 Future proofs tcomms code (#14805) 2020-11-01 09:26:02 -05:00
Qwertytoforty
e3ee0b01e8 Makes slimes have slime jelly for blood (#14665)
* Makes slimes have slime jelly for blood, reduces the healing and toxin effects of slime jelly

* Slime jelly is a diffrent colour so it does not look like blood, slime jelly iv bag added, said bag is now found in nanomed plus

* Makes slimes bleed in c o l o u r, makes iron affect exotic blood species.

* Makes slime blood always the same colour as skin, fixing dye and CMA issues

* Fixes iron mistake

* Fix henk stuff

Adds EXOTIC_COLOR trait, used if you want exotic blood to be coloured when splattering, in this case slime blood. Removes uneeded blood data stuff

* Update toxins.dm

* Fixes the black blood issue

By B-B-BLENDING the slime colour with a medium grey, it helps match the blood colour to the true colour of the slime way better, meaning that a default slime that looks grey (but techicaly has pitch black skin codewise) will have grey blood.

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Signals for henk, fixes henks worries, less processing

* Fixes runtime

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: farie82 <joepvelden@hotmail.com>
2020-10-31 17:49:55 -04:00
AffectedArc07
bc0c8f8c56 Merge pull request #14745 from Adrer/Flipped-Table-Sprites
Adds flipped poker table sprites (And fixes other flipped table sprite shenanigans)
2020-10-29 14:28:31 +00:00
AffectedArc07
2e0dcd641f Merge pull request #13549 from farie82/tubes-tweak
Refactors and reworks transit tube pods. Maint drones can now also use them
2020-10-29 14:07:58 +00:00
joep van der velden
b586a90257 Makes pods work with the force_eject_occupant proc 2020-10-29 00:08:52 +01:00
AffectedArc07
2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
Qwertytoforty
997f527f3a Adds the emp bomb, and a beacon to summon it. (#14737)
* Adds the emp bomb

* Allows traitors to buy it, corrects mistake in syndicate uplink

Also prevents explosions from setting it off

* Update code/game/machinery/syndicatebomb.dm

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

* Update code/game/objects/items/devices/radio/beacon.dm

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

* steels suggestion

* Dave's request

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-28 11:43:12 -04:00
Mitchs98
ce302657ec Makes Canes Bigger (#14705)
* Cane Big

* Medium does not exist
2020-10-26 23:50:28 -04:00
Adrer
5d926c57e0 Flipped poker table sprites and other flipped fixes 2020-10-27 02:59:27 +01:00
Iren
26486a2261 Combat Defib - Cell Change (#14698)
* Combat Defib - Cell Change

* Source has been Implied

* Affected doesn't like Space

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-26 20:01:01 -04:00
AffectedArc07
ca29f5340e Runechat - stop bugging me for gods sake (#14141)
* Runechat - stop bugging me for gods sake

* Hotfix

* V2

* Patch 1

* Removes Radio

* Colour Sanity

* Fixes loc issues

* 2020-08-28

* LF --> CRLF

* Forgot this

* Fixes holopad stuffs

* Preference toggle existing!

* Drask + Kidan
2020-10-26 10:10:09 -04:00
PacifistDalek
0c22bb3e7e Updating some of our food sprites to better ones from other codebases (#14694)
* Adding in new sprites for a bunch of crappy food sprites

* Adding attribution for Goon origin sprites

https://github.com/binarysudoku has relicensed the sprites requested for our use (relicensing means they don't have to go in a separate folder). I've included attribution notes on each sprite that I've taken, as per our license

* Added a bunch more sprite changes!

* forgot the holymelon

* Updating trash sprites for junk food, adding a space twinkie trash sprite
2020-10-25 00:16:13 -04:00
AffectedArc07
4bb6a4929f Merge remote-tracking branch 'ParadiseSS13/master' into pr/warior4356/14493 2020-10-24 09:51:04 +01:00
AffectedArc07
bb6a31ae10 TGUI RPD (#14702) 2020-10-23 16:08:07 -04:00
warior4356
25da16d6d4 Merge branch 'master' into corporate-comms 2020-10-21 19:14:17 -07:00
Kyep
f5a1a359a1 ERT Commander Rework (#14640)
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-21 09:44:37 -04:00
PacifistDalek
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
moxian
ed9c3a22e1 Make floor painter UI nicer and move it to TGUI (#14635)
* Make Dropdown component use `selected` prop instead of state.

This makes the selection properly update when it's changed server-side.

* Make floor painter preview available directions nicely.

Also migrate it to tgui while at it.

* Have a preview of all available styles with pictures.

Also address the review comments.
2020-10-21 00:12:38 -04:00
AffectedArc07
19df15ad21 TGUI Mirrors + CMA (#14648)
* TGUI Mirrors + CMA

* Forgot this

* Farie tweaks

* Optimisations
2020-10-19 14:16:20 -04:00
joep van der velden
9ef602bb1b TGUI labor claim console. Fix fifty stack dupes 2020-10-18 16:18:38 +02:00
Darkmight9
8782c2ca32 Culinary QoL update (#14610)
* Culinary QoL update

* Changed the culinary tool apron sprites
2020-10-17 13:30:44 -04:00
Iren
4a21b6787f Code Standarisation - Tank Distribute Pressure (#14562)
* Code Standarisation - Tank Types

* Tank Distribute Pressure Standardisation

* Anesthestic Tank at O2 Standard

* Update tank_types.dm

* Distribution Pressure Fix

* TANK DEFAULT RELEASE PRESSURE
2020-10-17 13:16:46 -04:00
warior4356
73d5361695 Merge branch 'master' into corporate-comms 2020-10-16 21:45:48 -07:00
SteelSlayer
01e81b98d1 affected pass 2 2020-10-16 16:14:18 -05:00
SteelSlayer
6b3c022be6 affected first pass 2020-10-16 16:14:06 -05:00
SteelSlayer
3a23a6b5b8 tgui rcd 2020-10-16 16:14:06 -05:00
variableundefined
e039b8e560 Rename all instances of "virgin" being used as a variable name to more appropriate and self-explanatory variable name 2020-10-15 16:11:11 -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
TDSSS
59347d99a1 [Review Ready] New station goal: Bluespace mining tap (#12062)
* Initial stuff

* Lots of small changes to get this functional

* Objective aspect works

* Fancy sound and icons

* Polishing, tweaks, branch update

* Incorporates review comments, fixes merge conflcits, updates branch.

* Made it work again, after another rebase

* Rudimentary tgui port, UI needs serious prettying up but is functional

* Much prettier TGUI with slider

* More TGUI improvements

* removes code I have absolutely no memory of writing that seems useless

* code cleanup

* Review comments incorporated

* autodoc

* one more autodoc comment

* more review comments

* filler change

* Forgot one

* return value on delete fix

* disregard that, this is better

* now using qdel_list

* Crate now comes with instructions

* adjusted instruction wording

* tgui messed up, fixed now
2020-10-15 09:31:57 -04:00
Qwertytoforty
e596560604 Prevents flash / sonic powder from working on blob tiles again. (#14559)
* Prevents flash / sonic powder from working on blob tiles again.

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-14 23:43:03 -04:00
warior4356
74da3a3992 Merge branch 'master' into corporate-comms 2020-10-12 16:31:15 -07:00
AffectedArc07
13a0e7178f Merge pull request #14566 from farie82/mmi-borging-alert
Adds an alert to the ghosts before people borg a playerless MMI. Will prevent borging till the ghost is in the MMI
2020-10-11 10:07:16 +01:00
ZEUS\samcr
70c5d4b987 IPC First Aid Kit No Longer Has Oil 2020-10-09 14:35:44 -04:00
joep van der velden
8eaa959c4f Adds an alert before people borg a playerless MMI 2020-10-08 23:51:53 +02:00
AffectedArc07
3ee7d2e89e Merge pull request #14525 from FlattestGuitar/oc-donut-steel
fancier donut boxes
2020-10-08 17:11:42 +01:00
Mieszko Jędrzejczak
2d83dbdde0 /
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-06 14:00:36 +02:00
AffectedArc07
b9ac5c0f57 Merge pull request #14529 from Kiyahitayika/Morgue-Destroy-Fix
Morgue Destroy() Fix
2020-10-05 16:00:39 +01:00
Kiyahitayika
f804e46adc Update morgue.dm 2020-10-04 20:49:21 -04:00
TDSSS
dbd162dff3 Adds Atmospheric Anomaly (#14433)
* New anomaly

* spacing

* agent b B-gone

* ansaris request
2020-10-04 13:44:29 -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
AffectedArc07
2b7c9c2b1f Merge pull request #14513 from SabreML/bnotice
Removes the 'bnotice' span class
2020-10-04 18:14:22 +01:00
Kiyahitayika
c48c6b59ff Update morgue.dm 2020-10-03 19:29:33 -04:00
Kiyahitayika
729c3a1923 Morgue Destruction Fix 2020-10-03 19:15:25 -04:00
FlattestGuitar
153147bcba donut box improvements 2020-10-03 20:34:33 +02:00
warior4356
b157355763 Merge branch 'master' into corporate-comms 2020-10-02 17:04:04 -07:00
joep van der velden
83fb00a12b Flavor text 2020-10-02 21:45:27 +02:00
joep van der velden
51577e8695 Fixes camera bugs 2020-10-02 21:38:37 +02:00
SabreML
3f8ee9b375 Removes 'bnotice' span class 2020-10-02 16:17:26 +01:00
warior4356
8004bc9349 Adds procedure radio to radios and intercoms for the correct jobs 2020-10-01 13:09:53 -07:00