Commit Graph

509 Commits

Author SHA1 Message Date
nightred 15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
LemonInTheDark df9d859da8 Fixes tesla bugs, makes code better (#49260)
* Cleans shit up, adds some upper limits on zap count, makes explosions less commen. Need to fix apc issue before
I test how it plays

* Mood, buffs and nerfs tesla

* Cherry-Picking

* eyyo

* back to basics

* aight

* broooooooooooooooooo

* adds else

* range

* fixes shit

* Sure

* Cleans shit up

* Fixes prob issue

* Gee I like this spooky guy

* I swear to god if prob picks just makes a list I am gonna blow a gasket
2020-02-27 12:06:52 +01:00
fluffe9911 5eea39977d [READY TO BE MERGED] King Goat Achievements, bugfixes, and minor tweaks (#49159)
* king goat memes

* I cant grammar

* newline

* the arena is no longer pressurised

* How into grammar

* I am embarrassed I did not notice this

* no hotel vacations in the arena

* better goat hoof sprite curticy of stephen

* new goat gun sprite

* might as well

* grammar

* no more king goat plushies in toy crates

* Update code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* done

* based and redpilled

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-24 20:47:42 -05:00
ShizCalev 12bf56f5df Merge pull request #49449 from XDTM/deadNdeaf
Makes sixth sense only able to hear regular deadchat
2020-02-20 22:56:16 -05:00
spookydonut 3792c44717 Merge pull request #49447 from trollbreeder/master
Fixes #49156, godhand touch spells now visible as item
2020-02-21 11:45:22 +08:00
XDTM 19655de8c7 Makes sixth sense only able to hear regular deadchat 2020-02-19 18:57:22 +01:00
trollbreeder 687fcbf80d I've had EI NATH of you. 2020-02-19 13:56:15 +01:00
ShizCalev 7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
AnturK e3fca45a78 Fix a few small runtimes (#49352)
Nothing special here, mostly sanity.
Defib hud is awful, needs rewrite.
2020-02-16 00:40:11 -08:00
itseasytosee 31ffa4a2da Tastes like nothing (#49240) 2020-02-08 14:57:50 -05:00
spookydonut 01b4d9e811 Fix cast() parameters (#48997)
About The Pull Request

Working on detecting type mismatches of parameters for SpacemanDMM and discovered these.

I also checked by hand that all uses of cast() provide a list as the first argument.
2020-01-27 09:48:42 +13:00
MrPerson f7eb2c905b Unicode awareness Part 2 -- copytext() (#48512)
* Unicode support Part 2 -- copytext()

This is the transition of all copytext() calls to be unicode aware and also some nearby calls in the same functions. Most things are just replacing copytext() with copytext_char() as a terrible character limiter but a few others were slightly more involved.

I replaced a ton of
````
var/something = sanitize(input())
something = copytext(something, 1, MAX_MESSAGE_LEN)
````

with a single stripped_input() call. stripped_input() already calls html_encode(), trim(), and some other sanitization so there shouldn't be any major issues there.

This is still VERY rough btw; DNA is a mess, the status displays are complete ass, there's a copytext() in code\datums\shuttles.dm that I'm not sure what to do with, and I didn't touch anything in the tools folder. I haven't tested this much at all yet, I only got it to compile earlier this morning. There's also likely to be weird bugs until I get around to fixing length(), findtext(), and the rest of the string procs.

* Makes the code functional

* Assume color hex strings are always # followed by ascii.
Properly encodes and decodes the stuff in mob_helpers.dm which fixes some issues there.

* Removes ninjaspeak since it's unused
2020-01-18 13:07:22 +13:00
spookydonut 3195ceaa22 Update SpacemanDMM suite to 1.2 (#48785)
* Update SpacemanDMM suite to 1.2

* Fix new lint errors
2020-01-16 11:49:39 -05:00
LemonInTheDark f4f8a686df Makes grounding rods consistent, changes the supermatters bolts a great deal. (#48472)
* Goof I will find you and I will berate you

holy hell

Calm and peaceful ahhhhh

I swear goofs pc failing was the biggest tragedy in gaming

Fixes some flags

More touchups

Now to squash

Goofs PC failing was the biggest tragady in GAMING

* Fixing some misspellings before the bee gets me

* GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

* Full vehicle support

* Changes some flags around, "fixes" some bugs, makes being shocked less insane

* Makes spliting more reasonable, unfucks some shitty tesla code I copypasta'd into the sm, godspeed shitcode,
none noticed you.

* Removes my tesla_ignore_1 fix, another pr is up that should solve things, so we're just leaving it in for now,
gonna have to deal with merge conflicts when it gets merged, but that won't be too bad

* tfw

* Nothing to see here folks

* I'm a boomer
2020-01-10 23:25:11 +11:00
Emmett Gaines 53024590de Can pass refactor (#48659)
* Makes all CanPass procs call parent

* Makes CanPass more extendable and gives the mover a say in the matter

* Replace CanPass with CanAllowThrough to use the new system

Regex replace `(?<!proc)/CanPass\(` => `/CanAllowThrough(`

* Simple optimization pass
2020-01-08 21:31:49 +01:00
81Denton e4b6de4097 Removes unneeded teleport check (#48314) 2019-12-21 18:29:08 +01:00
JDHoffmann3 8f492ac42f Vampires maintain blood level over bat form (#48203)
* Vampires maintain blood level over bat form

* Blood level tracked if damage tracked
2019-12-11 19:29:36 -05:00
skoglol c815deb6ce Fixes some misused ghostize (#48121) 2019-12-05 18:05:00 +00:00
tralezab b521e214db [READY] shapeshifting in a pipe violently kills you: I WON EDITION (#47515)
* cast proc edit

I like these fringe interactions that punish you for trying something stupid in the hopes it does something game breaking.

* dead project style *dabs*

* cleaning up the code 1/2

* still needs work, fuu

* Update code/modules/spells/spell_types/shapeshift.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* fixes the check, once and for all

* FINALLY

* 😔 💯

Co-Authored-By: skoglol <skoglol@users.noreply.github.com>

* even more improvements

Co-Authored-By: skoglol <kriskog@users.noreply.github.com>

* here we go
2019-11-22 20:30:13 -05:00
Emmett Gaines 5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
oranges 1d6bb45d74 Remove some overly broad bad helpers and limit them to spell code (#47789) 2019-11-16 09:27:15 -08:00
Arkatos1 2179dd5c1f New mime spells icons (#47607)
* File, first few spells

* Changed path, more icons, clean dme

* Cleanu and tweaks, finger guns
2019-11-08 22:23:32 +01:00
spookydonut 2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Tlaltecuhtli fcfbd9f92e fixes a missing space in spit personality radio (#47558)
🆑
spellcheck: adds a missing space in split personailty radio
/🆑
2019-11-04 11:44:22 -05:00
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