Commit Graph

714 Commits

Author SHA1 Message Date
Fikou
2de0f90e46 usernotice gay (#47412)
removes a nonexisting spanclass
2019-10-27 08:49:02 -07:00
Shaps
708c7df7ab Intern Horde take 2 (#47263)
Intern Horde take 2
2019-10-25 11:18:25 -07:00
Cenrus
7eaade4d7f Fix abductor typos (#47350)
Fixes a small typo in the abductor console where the chemical dispenser 
was called "Reagent Synthetizer" instead of "Reagent Synthesizer".
2019-10-23 20:39:03 -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
2a4957420a Dynamic ruleset threat scaling and various fixes (#47100)
* baby steps.

* baby steps

* Nothing works yet.

* getting closer

* Base modes work

* Squashed some bugs, fixed config.

* small cleanup.

* dynamic.json, spaces to tabs

* Disabled events on dynamic.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Third and second ruleset probability.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Highlander ruleset stacking works correctly now.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Fixed a comment.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Allow changing variables in game mode with config.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Continue after invalid variable.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Changed how revolution ruleset ends the round.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* fixed rule probs, stacking/ready bug, logging.

* More logging.

* Moved persistent check.

* Revs dont end on rev loss.

* Brothers count correctly no.

* Revs no longer makes borgs, deads or off-z players revheads.

* No headrev replacements.

* revs now refund on fail, reviews

* comment

* no game option changes.
2019-10-22 18:16:30 +02:00
spessbandit
e3d1e5c53e ghosts can't use monitors; dextrous animals can climb crates; fixes atrocious spelling (#47262) 2019-10-22 04:37:35 -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
81Denton
1a0428f031 Fixes cult space bases (again) (#47041)
* Fixes cult space bases (again)

* h

* Fixes duplicate definition

* Lets cultists draw runes at the Lavaland cult altar ruin

* Adds CULT_PERMITTED_1 flag to check if cultists can summon/buld structures here

* h
2019-10-20 14:47:14 +02:00
81Denton
6f6b7ba47d Merge pull request #47183 from Firecage/Academyfixes
Wizard Academy Defender now actually spawns in the Wizard Academy instead of wizard lair, and ghosts can choose 'Never for this round'
2019-10-20 14:21:00 +02:00
kingofkosmos
56b8461580 Fixes. 2019-10-19 22:17:50 +03: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
Firecage
65fa6fa28e Two Wizard Academy fixes. 2019-10-18 10:48:43 +02: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
4dplanner
27413bcf40 Shade fixes (#47031)
About The Pull Request

fixes #46572 (I think)
Why It's Good For The Game
Changelog

cl
fix: shades now heal properly upon re-entering a soulstone (previously they would temporarily heal, then take back all the damage next time they were hit)
fix: shades summoned from a soulstone are no longer invincible
/cl
2019-10-13 16:46:25 +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
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
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
kingofkosmos
71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02: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
ATH1909
9e6950888d Advanced virus infection vector changes (#46730)
* Update advance.dm

* Update cough.dm

* Update cough.dm

* Update sneeze.dm

* Update disease_abilities.dm

* Update genetics.dm

* Update advance.dm

* Update sneeze.dm

* Update sneeze.dm

* Update cough.dm

* Update genetics.dm

* Update genetics.dm
2019-10-06 13:35:27 -04:00
Fikou
a191ceab07 Prevent soulstones from absorbing things with no soul (#46881)
soulstones now cant absorb things with no soul or devils.
things with no soul:
- wizard after using lich or soultap
- people that sold their soul to devil

it ruins the revival mechanics of both antags and also makes no sense 
in the lore, how can a soul shard capture a nonexistant soul
2019-10-05 13:26:37 -07:00
AnturK
5a0f57019c Event Arena Controller (#46746)
Event arena controller for you know what event.

TODO:

Turn lower/upper corner into just a/b and pick min/x/y
Unique HUD icon
2019-10-05 16:29:43 +13:00
Qustinnus
81c3d92129 Adds pick-up, drop and throw sounds for items. (#46677)
* finishes up

* adds sound volumes

* woops

* forgot to ctrl + s

* cloth

* smh

* done
2019-10-04 18:53:09 -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
ATH1909
484728b311 ATHATH touches disease code (and symptom code too, but that's normal) (#46774)
* Update symptoms.dm

* Update oxygen.dm

* Update heal.dm

* Update oxygen.dm

* Update heal.dm

* Update heal.dm

* Update symptoms.dm

* Update advance.dm

* Update advance.dm

* Update advance.dm

* Update symptoms.dm

* Update disease_abilities.dm

* Update advance.dm

* Update disease_abilities.dm
2019-10-01 09:03:21 +02:00
81Denton
8cfe0b3ccf Soul stone tweaks (#46765)
* Soul stone tweaks

* h

* fuck
2019-09-30 14:27:55 -04:00
XDTM
c2f38cbf4e Timestop improvements (#46745)
* Timestop improvements

* black lightlist
2019-09-29 20:18:31 -04:00
Fikou
e0c4e5ccd1 fixy wixy (#46740) 2019-09-25 18:16:29 -07:00
spookydonut
bfc4bbf8f2 Makes flash_protect values use defines (#46588)
* Makes flash_protect values use defines

* ctrl s is hard okay
2019-09-25 17:11:42 -07:00
spookydonut
210ba5c571 Adds linting for equipped() pickup() dropped() (#46614)
* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review
2019-09-25 02:31:29 -07:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
William Wallace
ed9f8a265b Revert "Give blood brothers traitor HUD (#45295)" (#46562)
This reverts commit c914d556c1.
2019-09-20 15:12:05 -07:00
AnturK
06fd043ab6 Fixes adding antag huds to newplayers. (#46555) 2019-09-17 10:53:58 -04:00
cacogen
755b649da5 Highlander event tries to drop items, heals and uncuffs (#46490)
* highlander event uncuffs participants when equipping them

* highlander tries to drop items instead of deleting, heals participants

healing also uncuffs them

* excessive use of integers

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-09-15 18:04:59 -04:00
spookydonut
00fa882721 Changes some typed loops to typeless loops (#46444)
* typeless loops

* new_player

* eol
2019-09-15 00:26:55 -07:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
skoglol
f4e7baa899 Adrenals reworked (#46211)
* Repurposes the adrenal implant.

* reverts adrenals back to 8tc

* updated uplink description, reduced oxy slightly.

* nanites in line, more description fix, stunresist back in.

* Pre testing.

* Final ling touches, removed stamcrit stun.

* Removes jitter, screen shake on metab end.

* woops.

* removes toxin damage.
2019-09-14 22:11:56 -07:00
AnturK
c6d0ce940f Fixes return to lobby issue with soulstone. (#46431)
* Fixes return to lobby issue. This code is still awful.

* Mm
2019-09-14 01:08:44 -07:00
Arkatos1
fb4bd33021 Lightning botl fix (#46436) 2019-09-11 10:09:51 -04:00
ATH1909
a3944dcde0 Halves the cooldown time between mutations for sentient diseases (#46399)
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update disease_mob.dm
2019-09-10 11:57:48 -04:00
nemvar
ab4f8bb903 Changeling Alt click Fix (#46403) 2019-09-09 13:02:42 -04:00
oranges
d646640e12 Merge pull request #46391 from nemvar/mekeeakkackkhain
Unscrambles melee_attack_chain
2019-09-09 18:49:54 +12:00
nemvar
84bee81790 Unscrambles melee_attack_chain 2019-09-07 16:12:01 +02:00
nemvar
1ead3e8ae7 Fixes morph movement and replaces magic numbers. (#46358)
* fixes morph speed shizz

* fixes morph movement
2019-09-06 16:23:28 -07:00
cacogen
1f010e7144 Selectively randomisable characters (#46108)
* Selectively randomisable characters

* it's a list now

* this doesn't work

* it's totally fucking fucked mate big time

* it works

* so sick of this goddamn pull request and yes i know this is a retarded way to do this it didn't work the other way

* anturk forestalls the inevitable suicide

'associative lists are more performant'

* final changes anturk requested

'remove all the "in randomise" and it's ready'
2019-09-06 08:50:12 +02:00
bgobandit
6b553d1ee8 fixes erroneous abductor text (#46287) 2019-09-04 10:22:25 -04:00