Commit Graph

8995 Commits

Author SHA1 Message Date
dearmochi
d2e034d80d Fixes Captain being contractor target, contractor batons not stunning silicon (#15096) 2020-12-12 16:25:25 +00:00
Qwertytoforty
e6a3b5575e Makes stunbaton stutter work (#15088) 2020-12-11 22:17:17 +00:00
danni boi
84ca0d1947 christmas cheer (#15045)
* christmas cheer

* modified christmas cheer to be less in the way

* fixed the bonfire, it was fugged

* added destructable snow

* fixed presents

* i fORGOT TO MAPMERGE WHY

* sprinkled frilly edges

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
2020-12-09 17:42:00 +00: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
SabreML
d3d729d1ef A couple of tweaks (#15004) 2020-12-09 11:52:21 -05:00
Qwertytoforty
f26e056bb6 Makes fireaxes take time to pry open airlocks. (#14837)
* Axes the axes ability to axe doors open

* Un-axes the bone axe, axes the ability for axes to axe open doors instantly, they must now axe nicely

* Update code/game/machinery/doors/airlock.dm

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

* Update airlock.dm

* Spessing

* Fixes a mistake

* Makes it the same thing, names variables, moves axe, makes it work

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2020-12-09 11:28:40 -05:00
SabreML
1b41b28763 Craftable donut boxes (#15051)
* Craftable donut boxes

* probably doesn't need two names
2020-12-06 10:25:33 +00:00
SabreML
d048bca6ae Donut box folding (#15027) 2020-12-05 10:28:36 +00:00
dearmochi
e78805c99f Fixes thermal drill not allowing safe opening, dial image preventing clicks and code words not clearing properly (#15024)
* Fixes thermal drills not allowing safes to be opened

* Unrelated fixes: make safe dial image click-through, better clean up codewords
2020-12-01 09:25:11 +00:00
moxian
dd94a30dbb Allow ghosts to look inside containers (#14996)
* Allow ghosts to inspect storage via alt+clicking

Also streamlines orient2hud calls a bit.

* Normal click now also opens the storage for ghosts.
2020-11-30 16:07:49 +00:00
dearmochi
05bdfe9426 Drops twohanded items that failed to wield instead of the user's active hand (#15022) 2020-11-30 15:58:32 +00:00
Kyep
ce7953b931 prevent reflector chat spam (#15019)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-11-30 09:38:59 +00:00
AffectedArc07
ee13f13a2a Merge remote-tracking branch 'Paradise/master' into nanoui-is-dead 2020-11-29 09:46:30 +00:00
SabreML
28cea0e1d0 [TGUI] Airlock Electronics (#14971)
* Airlock Electronics V1

* Airlock Electronics V1.1

* Airlock Electronics V1.2

* AA tweak thing
2020-11-29 09:45:28 +00:00
Kyep
e371ad0326 Fixes TGUI ghost orbit menu runtime (#15011)
* orbit menu tgui debugging

* CI test

* enforce R.mmi.brainmob.name != null

* typing

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-11-29 09:42:53 +00:00
AffectedArc07
4996ac3373 Merge remote-tracking branch 'ParadiseSS13/master' into nanoui-is-dead 2020-11-27 10:21:41 +00:00
Kyep
4a944658ad [TGUI] Upgrades Bots (#14871)
* secbots, ED209s, cleanbots

* Apply suggestions from AA code review

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

* fluid buttons, Restore Safties

* pai rebuild

* deletes all spacing from data list

* katana needs_permit

* lava/storm/boneaxe needs_permit

* check s_store

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-11-27 09:56:02 +00:00
dearmochi
edf4debdeb Fixes akimbo (crafted) chainsaws (#14993) 2020-11-26 09:45:00 +00: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
AffectedArc07
44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
AffectedArc07
03934e8171 Nukes recursive effects (#14936)
* [WIP] Nukes recursive effects

* Finishes the rest of the stuff

* Mochi tweaks
2020-11-25 23:59:30 -05:00
Darkmight9
89a6f4c0ae Doubles the contents of the jani closet (#14939)
* Doubles the contents of the jani closet

* Removes the extra clothes and moves the spares down the list
2020-11-25 23:58:29 -05:00
Adrer
b93606b518 Flipped fancy tables now have sprites (#14978) 2020-11-25 23:57:39 -05:00
danni boi
ca97f9a92d Windowpainter (#14888)
* adds a window painting tool

* Update code/game/objects/items/devices/window_painter.dm

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

* gigit

* edited code to match steelslayer's suggestion

* Update code/game/objects/items/devices/window_painter.dm

OOF thank you for catching that

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

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-11-23 19:07:54 +00:00
Farie82
ec5f7dd8a5 Stops explosions causing millions of runtimes (#14931) 2020-11-23 19:03:20 +00:00
Darkmight9
30de304fdc Makes grass, flowers, and bushes easily destroyable (#14926) 2020-11-22 21:36:37 +00:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07
984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
dearmochi
3613057b9d [TGUI] Safe (#14952)
* [TGUI] Safe

* Address AA, content list scrollbar
2020-11-21 09:04:46 +00:00
Ryal
37225485c9 Actually prevents swarmers from eating high-value targets (#14923)
* Prevents swarmers from eating high value targets

* Changes fluff
2020-11-19 09:25:21 +00:00
Ryal
96f0652115 Makes morgue tray respect unrevivable mobs (#14908)
* Makes morgue tray respect unrevivable mobs

* Removes unneeded logic

* Cleans up logic
2020-11-18 18:09:37 +00:00
moxian
16d2638c0a Cardiac problems have a dedicated icon on medhud, not a generic "disease" (#14900)
* Cardiac problems have a dedicated icon on medhud, not a generic "disease"

* Rename "huddefib2" -> "hudflatline"
2020-11-18 18:08:01 +00:00
AffectedArc07
faa14aa7a6 Merge pull request #14804 from warior4356/crate-warning
Adds confirmation message to CC packed crates
2020-11-16 08:30:45 +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
warior4356
673623d942 Made check less snowflakey 2020-11-08 23:20:23 -08: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
warior4356
18ceb59950 Resolves edge case with defile and knock 2020-11-02 20:03:35 -08:00
warior4356
394a1b258f Cleans up code 2020-11-01 14:21:31 -08:00
AffectedArc07
4da9abeb50 Future proofs tcomms code (#14805) 2020-11-01 09:26:02 -05:00
warior4356
60f09bcdc4 Adds confirmation to CC packed crates 2020-10-31 16:51:41 -07: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
mochi
e43d8fe08f Aquarium QoL: Fish bag, lower hunger rate and more 2020-10-27 13:11:51 +01: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