Commit Graph

2768 Commits

Author SHA1 Message Date
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
d6af52dd2b world/Topic Refactor (#14850)
* world/Topic Refactor

* These arent needed anymore

* How could I forget this

* Biggest edit ever

* Forgot this

* Mini refactor
2020-12-09 11:24:33 -05:00
AffectedArc07
44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
AffectedArc07
e859088889 SSdiscord tweaks (#14899)
* SSdiscord tweaks

* Update code/modules/admin/verbs/adminhelp.dm
2020-11-26 00:01:43 -05:00
AffectedArc07
d74dac1821 Ingame CentCom Ban DB Lookup Interface (#14921)
* Ingame CentCom Ban DB Lookup Interface

* Farie Tweaks
2020-11-24 10:18:44 -05:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
Qwertytoforty
cebc4b50ef Pinpointers can now point to their respective nuke. (#14783)
* Allows crew and operative nuclear pinpointers to point to their respective nukes

* Maybe hit a few more of them

* Removes true/false from active, fix henk question.

* SSSPEEEEEEEEEEEDprocess

* Steels requests

* Mode is 2 in some cases(thanks adv pinpointer), steels request

* REFACTORS PINPOINTERS AGAIN and henks stuff

* Fixes travis + runtimes

* Update code/game/gamemodes/nuclear/pinpointer.dm

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

* Henks requests

* Switches things up

* Apply suggestions from code review

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

* Fixes it, adds desc as per affecteds request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-11-18 20:26:37 +00:00
SabreML
499bc77723 Update admin_verbs.dm (#14918) 2020-11-17 13:26:42 +00: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
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
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
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
mochi
72ddc710e5 Auto-highlight code words, view code words in Secrets 2020-11-02 22:18:53 +01: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
AffectedArc07
8cd7748f64 Client BYOND account creation date tracking (#14733)
* Client BYOND account creation date tracking

* Mochi suggestion

* Tweaks
2020-10-27 14:18:10 -04:00
AffectedArc07
20a8424fff TGUI AI Law Manager (#14636) 2020-10-17 14:01:27 -04:00
SabreML
cadfb7c433 Light fixture code cleanup & spooking (#14396)
* Autumn cleaning

* A few things I missed

* Set 'update' back to 'FALSE'

* Allows ghosts to burn out lights

And also tweaks the adminverb 'Fix all Lights' to reset the 'switchcount'.

* Tweaks burnout value

* A few more tweaks

* Removed an else

* I thought I'd already done this, guess not!
2020-10-17 13:57:36 -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
Qwertytoforty
69b59c68a7 Makes the vox spikethrower more like a cyborg LMG, fixes bugs with it. (#14577)
* Makes the vox spikethrower more like the cyborg lmg, instead of its own cursed code.

* Update code/modules/projectiles/guns/alien.dm

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

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-15 07:49:05 -04:00
AffectedArc07
6c8d01a784 Fixes admins getting stuck in proc security hell (#14607)
* Fixes admins getting stuck in proc security hell

* Forgot to remove my test
2020-10-14 14:49:30 -04:00
AffectedArc07
a50f656d8d Game Preferences Update (#13936) 2020-10-09 14:53:59 -04:00
AffectedArc07
37a1f6be05 Merge pull request #14527 from dearmochi/tgui-newscaster
[TGUI] Newscasters
2020-10-07 09:48:44 +01:00
Qwertytoforty
e0569ba260 Update code/modules/admin/admin.dm
s p e s s e s

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-06 17:20:41 -04:00
Qwertytoforty
9a62fb57df Arcs requests, and kyets and everyone else that commented requests 2020-10-06 15:48:27 -04:00
Qwertytoforty
724575af11 Slings and shadowlings are the same thing you gronk 2020-10-05 16:36:47 -04:00
Qwertytoforty
a162cb4c90 Gives admins a way to smoothly end a round 2020-10-05 16:24:46 -04:00
mochi
8a9b3c5e74 Merge remote-tracking branch 'upstream/master' into tgui-newscaster 2020-10-04 20:48:01 +02:00
AffectedArc07
8537de8aa6 Merge pull request #14131 from farie82/ticket-conversion-fix
Refactors the ticket code. Fixes the ticket conversion. Removes bolding of names etc in tickets
2020-10-04 18:26:52 +01:00
mochi
c2f494cdaa [TGUI] Newscasters 2020-10-03 23:55:58 +02:00
mochi
d242710421 fix typo 2020-09-29 16:37:58 +02:00
mochi
324e053c1a Merge branch 'master' into fix-ghost-poll-chat-signup 2020-09-29 15:08:16 +02:00
AffectedArc07
1e40897382 Merge pull request #14453 from Kyep/aghost_fix
Fixes aghosting makes your inventory invisible
2020-09-27 09:20:06 +01:00
AffectedArc07
5d0fa0a0b7 Improved system 2020-09-27 08:47:20 +01:00
Kyep
acd9bcfa29 Fixes #13269 - aghost makes your inventory invisible 2020-09-26 19:53:48 -07:00
joep van der velden
286472229a Rename the var to be less confusing 2020-09-22 08:33:06 +02:00
joep van der velden
fa423ab9e6 Wrong param changed. Player panel fixed 2020-09-22 08:29:39 +02:00
joep van der velden
a85b0b5496 Merge remote-tracking branch 'upstream/master' into ticket-conversion-fix 2020-09-21 23:10:40 +02:00
farie82
1ffca6dfed Makes PMs work after the client reconnects (#14404) 2020-09-21 15:08:34 -04:00
farie82
d68ea1dc42 Update code/modules/admin/verbs/randomverbs.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 12:35:01 +02:00
joep van der velden
dccd56d640 Adds a confirmation to the deny shuttle call verb 2020-09-20 11:12:48 +02:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
AffectedArc07
d587b05d02 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14200 2020-09-15 21:00:07 +01:00
Kyep
222d17c01f fixes merge conflict 2020-09-15 08:56:35 -07:00
Kyep
b9e0ca1359 fixes merge conflict 2020-09-15 08:54:10 -07:00
Kyep
28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
dearmochi
34a8f1de7c Update code/modules/admin/verbs/gimmick_team.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-09-10 23:58:25 +02:00
mochi
aaa79c5a3e Fix gimmick teams, missing poll icon 2020-09-02 12:05:06 +02:00
Kyep
c7d869c46d var/nukecode = rand(10000, 99999) 2020-08-31 11:00:23 -07:00