Commit Graph

485 Commits

Author SHA1 Message Date
kingofkosmos
8768b6b3b5 Removes unused & undefined spans (#47436)
* Removes all instances of 'caution', 'error' and 'notify'.

* Removes span classes which were either not used at all or were used very infrequently.
2019-10-30 02:00:11 -07:00
81Denton
6b1161ecd9 Cleans up revive related procs (#47025)
* Cleans up revive related procs

* h

* fuck

* Fixes proc arguments

* Further fixes

* Unfucks line endings
2019-10-22 15:16:13 -07:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00
kingofkosmos
259626a8b4 Removes excess spaces in messages. 2019-10-13 14:36:43 +03:00
James
a05d954b45 Split personalities can now communicate directly (#46875)
About The Pull Request

This PR allows people with the split personality trauma to communicate with the stranger and vice versa through an action button. I also considered adding an option for the active player to release control but I felt that would be breaking the spirit of brain traumas a bit much.
Why It's Good For The Game

Split personality has always been a situation where the second player's only real option is "How many times can I shout "I'm Gay"/WGW over radio and try and avoid surgery until I inevitably get removed?" Don't get me wrong, you can still do that, but I aim in this PR to give players another option to get some of that sweet RP in. The main argument I can see coming up against this change is that traumas are supposed to be negatives, but how I see it, this doesn't make Split Personality a positive trauma so much as it allows roleplay similar to how you can roleplay as a paraplegic war veteran or as an ex-security officer who developed a phobia following an 'incident'. I'm happy to add a cooldown to the action if it proves to be an issue.
Changelog

cl
add: Split personalities can now communicate with an action button
/cl
2019-10-13 16:54:12 +13:00
Couls
ec1df6c7e7 fix some blindness issues (#47024)
About The Pull Request

fixes #47020 #47022
I didn't have a max set for the adjust_blindness proc which allowed it to go below zero which meant if you took eye healing chems it would actually make you blind forever, the issue with the wizard spell blinding you permanently was due to a check to see if duration was less than charge_max for genetic spells which was used for making mutate permanent, but also made the blindness spell permament
Why It's Good For The Game

Being blind forever can suck
Changelog

cl
fix: blindness spell now only blinds you temporarily
fix: drinking carrot juice no longer permanently blinds you
/cl
2019-10-13 16:45:47 +13:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
nemvar
c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
William Wallace
66202f3e2c remove duplicate var definition in /obj/effect/proc_holder/spell/targeted/turf_teleport/blink/cult 2019-10-09 00:22:39 +01:00
nemvar
a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
nemvar
daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
XDTM
c2f38cbf4e Timestop improvements (#46745)
* Timestop improvements

* black lightlist
2019-09-29 20:18:31 -04:00
nemvar
27dbe6cf0c Fixes proximity checks (#46652)
* Fixes proximity

* shock hand no longer calls parent

* actually lets just let it do what it does.
2019-09-22 03:03:45 -07:00
Fikou
a439c6ac37 makes the ed209 a child of securitrons instead of a horrifying copypaste (#46230)
About The Pull Request

does what says on title, becomes a securitron that can shoot people
removes ed209 cell because it doesnt do anything why does it even exist
fixes ed209 crafting using dragnets
sadly, removes lasertag mode from ed209, but ive never seen anyone use it and it made everything a lot more confusing
eds now shoot you even if youre lying down because i guess that you could rest before to avoid getting shot but im not 100% sure
Why It's Good For The Game

fixes tons of horrifying copypaste
also fixes some minor things
Changelog

cl
del: Lasertag EDs have been removed
code: EDs are now not a horrifying mess of copypasted securitron code
balance: EDs now still shoot you if you're lying down
tweak: you no longer need a battery to make an ed209
fix: fixes ed209 crafting using dragnets instead of disablers
/cl
2019-09-16 16:33:19 +12:00
bgobandit
b93888c1bf Prevent wizards from rod-forming in the den (#46267)
No more rod form in the wizard's den. This applies whether you are a 
wizard or whether you somehow ended up in the den and are not a wizard, 
which I don't know how that would happen, but if you did.
2019-09-06 19:55:58 -07:00
plapatin
aaa00e9c02 Update mime.dm (#46311) 2019-09-04 12:25:35 -04:00
bgobandit
150d446a74 [s]Wizards no longer get a free use of a touch spell by refunding the spell. (#46249)
* deletes any touch spells if the wizard refunds the spell in question

* moves touch removal code to on_lose

* makes pkp suggestions

* adds message feedback
2019-09-03 00:27:29 -04:00
ATH1909
834121dfb9 Makes the Mutate spell less annoying to use (#46092)
* Update genetic.dm

* Update spellbook.dm

* Update spellbook.dm

* Update genetic.dm
2019-08-30 19:35:58 +02:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
oranges
57266c7d35 Merge pull request #45701 from Dennok/ChangeTurf-calls-add-keep-air
Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls.
2019-08-21 11:23:11 +12:00
tralezab
4e6467b934 you can no longer shoot finger guns while incapacitated (#45947)
* song for this fix: Elton John - Goodbye Yellow Brick Road Lyrics

* always need two runs huh
2019-08-17 00:34:40 -07:00
skoglol
e565f8ec0e Fixes sentience balloon icon (#45791) 2019-08-09 15:10:48 -07:00
ATH1909
0b1579af08 Changes the Disintegrate spell's name to "Smite" (#45786)
* Update godhand.dm

* Update touch_attacks.dm

* Update spellbook.dm

* Update spellbook.dm

* Update godhand.dm

* Update touch_attacks.dm
2019-08-09 15:06:06 -07:00
Dennok
d464a7c689 add flag CHANGETURF_INHERIT_AIR 2019-08-04 12:54:12 +03:00
CRITAWAKETS
2f1f82dddb Fixes time-stop spell incantation (#45585)
About The Pull Request

Corrects the time-stop incantation from "TOKI WO TOMARE" to "TOKI YO TOMARE" as per how Japanese works and also because thats what the reference actually says.
im honestly just doing this so that i could figure out how github even works
Changelog

cl
spellcheck: Wizards now properly reference DIO when stopping time.
/cl
2019-08-01 20:53:58 +12:00
Tlaltecuhtli
67fe38921a fireball starts at 8 tile range, increases 2 for every level (#45404)
* Update maps.txt

* 1

* levels
2019-07-27 20:09:46 -07:00
py01
353ef81789 Magic projectile fixes (#45484)
* magic projectile changes

* fixes var path

* undoes magic changes

* magic proj changes

* am checkchaange

* removes bad refactor

* proper am check on mag missile

* locker staff fix
2019-07-27 19:58:58 -07:00
skoglol
718973fb9f Removes the assimilation/hivemind gamemode (#45316)
* Initial pass

* comment.

* stray ,

* stray define begone
2019-07-27 00:08:53 +02:00
Arkatos1
5ba54c29b9 New Wizard icons (#45439) 2019-07-25 23:16:30 -07:00
loser
59f7252d42 Mind Control suddenly wakes up, as though he was under foreign control! (#45267)
* Mind Control suddenly wakes up, as though he was under foreign control!

* no sexism
2019-07-20 00:50:05 -07:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
Kierany9
2778f2f7dc Fix a bug in Network Invasion (#44815)
#43978 messed up some of the logic in Network Invasion, causing it to
not work after standing still instead of the other way around. This
fixes that.

Also puts Sensory Shock, added in #44436, properly in the Hivemind
Abilities panel instead of the Spells panel which happened due to it
no longer being a child of spell/targeted_hive.
2019-06-26 15:10:02 -07:00
kingofkosmos
ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
kingofkosmos
6bbb64e2cf * more warnings 2019-06-25 21:46:21 +03:00
kingofkosmos
fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
kingofkosmos
df1aa091b2 * adds warning-spans to various messages 2019-06-24 21:05:22 +03:00
bgobandit
87006c3c6d Gives the mime two new spells: Invisible Chair and Invisible Box. [READY] (#44494)
About The Pull Request

    Adds two new mime spells to the game. Both work like the invisible wall, i.e. they spawn an invisible item for a limited amount of time:
    Invisible Chair: Summons a chair and has the mime sit in it. Perfect for crowded shuttles or staying put.
    Invisible Box: Everyone's favorite stock mime routine! The mime summons a box (invisible to everyone but him, although you do get the message once spawned) that can store small items. When it disappears, the items are dropped.
    To prevent massively overpowered mimes, the mime gets a spellbook at roundstart from which he can choose only one out of the three mime spells.

Why It's Good For The Game

The mime doesn't get nearly as much cool stuff as the clown, and these are pretty common pantomime routines to riff off.
Changelog

cl
add: After receiving many complaints about mimes who never pantomime, Nanotrasen has liquidated its mime personnel and hired new mimes who know more routines.
add: The mime gets the choice of two new spells: Invisible Chair and Invisible Box. They work much like the Invisible Wall spell does and disappear after a short span of time. The invisible chair can be buckled to like usual chairs; the box works like a standard inventory box item.
tweak: Mime spells are now granted via a spellbook that starts out in the mime's inventory. Mimes can choose one of these three.
/cl
2019-06-23 13:24:00 +12:00
FrankFo
645156ff60 De-linkifies names in deadchat_broadcast(), makes deadsay css class default (#44600)
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too

* Makes the source argument come after message, since it is optional

* Removes excess </span>
2019-06-18 22:49:02 +02:00
py01
ace1a0b390 Hivemind ability changes (#44436)
* fixes reclaim on dead hiveminds

* adds exnendo hand min range var

* replaces hive warp with telekinetic hands, no inhand sprites added yet

* changes hive_shock to sensory effects, no sleep

* syntax fix

* adds new curse variant

* sensory overload power modifier, heart attack replaced with necropolis curse variant

* hivedrain removes stam dmg

* does curse subtype in more sane way

* changes circadian sleep to knockdown

* spell path and icon path changes

* shock channel, pin weaker on hives, cooldown changes

* telekinetic hand inhand sprites

* adds message to teople surrounding mind contol victim on cancel

* hivemind icon changes

* nightmare changes

* removes stun on mc end

* hivemind forcewall lasts longer

* prevents negative power values on shock

* chages nightmare duration and effect

* hive shock changes

* userdanger message on mind control end so people see it

* fixes merge

* removes control change

* removes unneeded var

* typo

* fixes me commiting the wrong shit

* syntax fix
2019-06-18 08:56:01 +02:00
wesoda25
b81a18c29b [READY] Adds Purified Soulstones and Constructs (#44036)
About The Pull Request

Purification of a soulstone (hitting it with a bible as noncult) no longer destroys the stone, and releases a spirit. Instead, it purifies the stone, which is crew friendly and has a new sprite. Said stones can be placed into construct shells to create purified angelic constructs, which are easily distinguishable from cult/wizard constructs.
Why It's Good For The Game

Crew finding and using construct shells to create stealthy anti-cult constructs sucks. This PR would get rid of this shitty gameplay, and adds some new flavor to the whole cult/anti-cult dynamic.
Changelog

cl weeeeesoda
add: You can now purify soulstones! This can be done by any crew member using a bible on one.
add: Purified constructs can be created by using a purifed soulstone on a construct shell. Amongst their normal abilities, purified constructs can dispel cult runes by clicking on them.
del: Ability to place chaplains soulstone or mining soulstones in construct shells
imageadd: angelplasm, angelic sprites, purifed sprites
/cl
2019-06-01 08:41:37 +12:00
Ghom
17b3091867 Merges tinfoil (hat) protection into the anti_magic component. Implements it on Hivemind gamemode and telepathy. (#43978)
About The Pull Request

Was fairly shocked to find out hiveminds never took tinfoil hat protection in account, so decided to implement the factor in the game mode. Might have overdone it and probably erroneously changed a couple logics while getting rid of some really indented passages that could easily early return.
So what's said on the tin, this is lot more preferable than clunky is_type() checks on headwear anyway.
Also expanded tinfoil protection to hivemind and (non-revenant) telepathy.
Why It's Good For The Game

Let us remember the "purpose" of tinfoil hats.
Changelog

cl
code: Merged tinfoil hat kind of protection into the anti_magic component.
add: Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.
add: Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).
balance: Rebalanced many hivemind effects to be dampened/delayed by tinfoil shielding. Bruteforced Assimilate Vessel, One mind and Awake Vessel abilities will consume more tinfoil charges compared to others.
balance: Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.
/cl
2019-05-30 20:29:30 +12:00
ShizCalev
653314ae51 Merge pull request #44163 from AnturK/thisthingalsogetsstuckingc
Fixes some hivemind runtimes.
2019-05-28 10:12:40 -04:00
ShizCalev
9ab909a1c3 Merge pull request #44110 from py01/panic
More options for Induce Panic forced speech
2019-05-28 02:03:42 -04:00