Commit Graph

2291 Commits

Author SHA1 Message Date
Mr.Gustavo 8349e75248 Fixes IV bags not letting you change transfer rate while buckled. (#15216)
Title.
2020-12-31 12:07:44 +00:00
AffectedArc07 43ee2488c7 More New() -> Initialize() for /obj/structure (#15158)
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
2020-12-29 10:42:39 -05:00
AffectedArc07 8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
Varghh e54fad8525 Nuka cola speed buff nerf (#14815)
* Nuka cola now gives radiation

* Moxian review

Co-authored-by: moxian <moxian@users.noreply.github.com>

* Nerf speed, remove radiation

Co-authored-by: moxian <moxian@users.noreply.github.com>
2020-12-22 11:19:03 -05:00
moxian 1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
Farie82 3a0cf40ca0 Makes cling and smuta transforms update your sec HUD (#15085) 2020-12-11 19:27:07 +00:00
Qwertytoforty dbc9f1b1cf Adds 2 new blob reagents, radioactive gel, and teslium paste. (#14865)
* Adds 2 new blob reagents

* slight change

* Colour change for complementary, slightly more chance for shocking, better grammer for shock messages.

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Nerfs the radioactive blob

* Adds blob effect desc, slightly nerfs the 2 new types

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2020-12-09 12:12:32 -05:00
SabreML d3d729d1ef A couple of tweaks (#15004) 2020-12-09 11:52:21 -05:00
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00: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
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
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
Qwertytoforty f091f5c4d8 Adds some flaming hot logging 2020-11-04 18:32:47 -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
Iren ee664a866f Automender Tweaks (#14704)
* Applicator Tweaks

* Automender Tweaks

* Sprite Adjustment

* Reintroduces Smallhealth

* The Proper Way with Mutable Appearance
2020-10-31 17:44:45 -04:00
Ryal 4013fa8c15 Adds handheld booze and soda dispensers to the service borg (#14530)
* Saving progress

* changed from true/false

* Committing progress

* Fixes charging to be an even number

* Fixes botanical dispenser. PlantBGone and Weedkiller are NOT chems

* Removes depricated item

* Resolves merge conflict

* Adds the ability to swap cells

* Formatting changes

* Formatting fix

* Sprites updated

* Assorted fixes

* Fixed merge conflict

* Resolved Merge Conflict

* New to Initialize and adds switch

* Removes UI title var

* Removes comment

* adds switch statement

* Static data for chemicals

* Resolve Merge conflict
2020-10-30 11:22:42 -04:00
Balthusdire 8e7c892098 An update to bar drink sprites (#14118)
* An update to bar drink sprites

Updating the bar drink sprites from generic to new and unqiue sprites with a unified perspective

* Update drinks.dmi

* Update drinks.dmi

* Update drinks.dmi

* more updates
2020-10-26 12:18:46 -04:00
Fox McCloud 45440db96c Reagents Cleanup (#13656)
* Reagents Cleanup

* styling
2020-10-25 20:06:08 -04:00
moxian db092ae411 Fix cheese path. (#14699) 2020-10-23 16:11:17 -04:00
Aquilar 8b8dd8f620 Adds a number of new implants (#14348)
* adds CNS jumpstarter, hacking arm, janitorial arm and botanical arm implants.

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

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>

* Update augments_internal.dm

* Update augments_internal.dm

* error correction.

* new name for jumpstarter

* Update augments_internal.dm

* grammar

* taking some suggestions.

* adding a safe spraycleaner for the implant.

* more suggestions

* evenmoarsuggestions

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>
2020-10-21 09:52:11 -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
Patrick Meade 1be9e97c1e Fixes iteration bug in space cleaner (#14631) 2020-10-17 00:38:04 -04:00
Aquilar 9206af653d updates haloperidol and nanocalcium to take less effort to modify. (#14612) 2020-10-15 16:33:44 -04:00
AffectedArc07 0ad3254026 Merge pull request #14528 from TDSSS/cleaner-log-tweak
spraybottle logging change
2020-10-05 16:12:24 +01:00
AffectedArc07 3ca95d7e13 Merge pull request #14185 from Cocacolagua/go-rp-with-chef
Hot Chocolate and Chicken Soup nerf
2020-10-04 18:29:51 +01:00
AffectedArc07 54547a7ac5 Merge pull request #14440 from warior4356/cryoxadone-fix
Changes cryoxadone to check external temp instead of internal temp
2020-10-04 18:19:51 +01:00
TDSSS d2c928cc7a spraybottle logging change 2020-10-04 00:03:03 +02:00
warior4356 cb68c8b430 Bugfix 2020-10-01 13:12:16 -07:00
biotear 259a18a421 Add recipe for Iced Coco (#14489) 2020-09-30 20:25:59 -04:00
warior4356 f6965a2a76 Changes cryoxadone to check external temp 2020-09-25 22:01:07 -07:00
Qwertytoforty 59292bed7e Makes Curare have the can_synth flag = false (#14421)
Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-25 16:10:28 -04: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
TDSSS 33f600d0d3 Spray logging improvement (#14331)
* better logging

* now with target
2020-09-18 19:41:46 -04:00
Kugamo 3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
2020-09-18 01:14:19 -04:00
Marginalorb 45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
AzuleUtama 52eaaf5003 Reworks minor addictions for all addiction stages (#14297) 2020-09-16 14:40:04 -04:00
AffectedArc07 90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
SteelSlayer dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined ac1d7478fd Merge pull request #14211 from Qwertytoforty/ACKCHYUALLY
Corrects the description of Stimulants and Stimulative Agent
2020-09-15 21:01:01 -04:00
Qwertytoforty 862edd13ec Even more correct for henk 2020-09-06 11:07:34 -04:00
Qwertytoforty 62038304ce Corrects the mistake 2020-09-01 12:35:13 -04:00
mochi c2a6934f1b TM polish pass 2 2020-09-01 12:30:15 +02:00
Cocacolagua e222702fd3 hot choco and chicken soup nerf 2020-08-29 12:48:24 -03:00
mochi bd2dfeea52 Integrate #13529 2020-08-18 09:49:04 +02:00
mochi 1ebb300071 Merge branch 'master' into tgui-medical 2020-08-18 09:29:47 +02:00
AffectedArc07 5a463d22de Merge pull request #14019 from CornMyCob/gluttony
Makes it so you can no longer synth the Gluttony's Blessing reagent
2020-08-16 19:52:50 +01:00