Commit Graph
12762 Commits
Author SHA1 Message Date
f7fdf1107e [MIRROR] Makes venusflytrap mobs take fire and cold damage (#3215)
* Makes venusflytrap take fire and cold damage (#56565)

Venus flytraps were formerly immune to fire and cold damage. Now plasma fires and the coldness of space can hurt them. Fire does double the damage compared to cold.

At full health a Venus Flytrap will die in:

~5 seconds inside of a fire
~10 seconds inside of space

* Makes venusflytrap mobs take fire and cold damage

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-02-08 23:49:37 +00:00
7e0f1031e7 [MIRROR] Makes pressure proofing check for clothing coverage (#3191)
* Makes pressure proofing check for clothing coverage (#56612)

* Makes pressure proofing check for clothing coverage

Co-authored-by: Urumasi <Urumasi@email.cz>
2021-02-08 23:42:07 +00:00
53df094bab [MIRROR] Add pAI internal GPS to possible software (#3184)
* Add pAI internal GPS to possible software (#56404)

pAIs are now a useful space travelling companion, they can help you
navigate if lost (although only the pAI has the GPS view, so they'll
need to communicate the information). If you're holding a GPS, then the
pAI can find you even if you get separated.

* Add pAI internal GPS to possible software

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:38:53 +00:00
24454a93fe [MIRROR] Refactor ventcrawling flag into traits (#3178)
* Refactor ventcrawling flag into traits (#56620)

Instead of using var/ventcrawling on `/mob/living`, it is now instead
two traits. It functions in exactly the same way.

This now ensures that manipulation of ventcrawling will not clash with
any other manipulation, such as a proposed genetics ability to give
people ventcrawling, versus abductor organs.

---

Intended to be a pure refactor, no functionality should change.

* Refactor ventcrawling flag into traits

* Update true_changeling.dm

* Update true_changeling.dm

Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:37:21 +00:00
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
0a284aefdd [MIRROR] Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human. (#3177)
* Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human. (#56501)

NO_BREATH and NO_FIRE are added to Mafia/Highlander players and
plasmaman there won't be turned into Humans.
Also shifts Ashwalkers above Ethereals and under Lizards in human.dm
just too keep it in a pretty order.

* Plasmaman won't burn or breath in Mafia/Highlander instead of being transformed into a Human.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-02-08 23:08:04 +00:00
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
e83e1b7d41 Standardizes area paths and area-based nomenclature (#3125)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 22:59:05 +00:00
e0f4496e14 [MIRROR] flips space bat's damage range and the sergeant no longer spawns hurt (#3193)
* flips space bat's damage range and the sergeant no longer spawns hurt (#56626)

flips the min and max damage so at max they do 6 and at min they do 5 instead of the inverse. also raises Sergeant Araneus health to 250 from 200 (not max health, he already has 250 max they just spawned hurt)

* flips space bat's damage range and the sergeant no longer spawns hurt

Co-authored-by: Elli-Skala <69182855+Elli-Skala@users.noreply.github.com>
2021-02-08 11:51:57 +00:00
YakumoChenandGitHub c1e3e237ef More special examines: facehugger, ash flora (#3158)
* add some flavor text to facehuggers

* alien-only flavor text for facehugger toy

* skyrat edit

* botanist bonus for lavaland flora

* beer nuke special examine

funny message for cap and barman hinting that it could be used for a beer nuke.

* reverts nuclearbomb.dm

* Update facehugger.dm
2021-02-08 11:51:00 +00:00
731a995bcf [MIRROR] Improves Kissing (#3167)
* Improves Kissing (#56698)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-07 09:41:24 +00:00
21d6d62d98 [MIRROR] Fixes CTF runtimes / hard del (#3163)
* Fixes CTF runtimes / hard del (#56681)

* Remove mob from spawned_mobs on qdel

* Clear current mind when brain gets deleted

* Fixes CTF runtimes / hard del

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
2021-02-07 09:40:29 +00:00
SwiftfeatherandGitHub bb5e7dd054 Fixes a few grammar issues (#3154)
Fixes a few grammar issues sometimes seen by players.
2021-02-07 00:34:36 +00:00
CheshifyandGitHub 0d712c5cdf Removes Clown and Shadowpeople Transformation (#3151)
Removes the Clown and Shadowpeople transformation from the Anomalous Crystal.
2021-02-06 20:43:32 +00:00
35c031d618 [MIRROR] removes "null" (#3143)
* Remove string from snow golem species colour (#56664)

Instead of trying to use the string `"null"` as a colour, we just
use `null` to indicate the absence of species colour for snow golems.

* removes "null"

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-06 14:30:23 +00:00
3ebec87968 [MIRROR] Small fix for reset_pull_offsets() (that you probably won't even notice) (#3139)
* Small fix for reset_pull_offsets() (that you probably won't even notice) (#56671)

* Small fix for reset_pull_offsets() (that you probably won't even notice)

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-02-06 14:29:59 +00:00
GandalfandGitHub 4d6bfd4355 Misc bug fixes #1 (#3135)
* safety updatesa

* multiple bugfixes

* Update synth_emotes.dm

* Update synth_emotes.dm
2021-02-06 14:27:11 +00:00
2013fdbbe9 [MIRROR] Makes borg organ bags into an apparatus (#3106)
* Makes borg organ bags into an apparatus

* Update robot_modules.dm

* Update highlander.dm

* Update highlander.dm

* Update robot_modules.dm

* Update robot_modules.dm

* Merge branch 'master' into upstream-merge-56401

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:21:36 +00:00
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
c179c2bf59 [MIRROR] You no longer need to hold shift to open the context menu as a ghost (#3122)
* You no longer need to hold shift to open the context menu as a ghost (#56646)

* You no longer need to hold shift to open the context menu as a ghost

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-05 22:06:57 +00:00
25df6e7da3 Cleaning up robot code: modules renamed to models & DOGBORG REWORK (#2837)
* Cleaning up robot code: modules renamed to models

* Merge branch 'master' into upstream-merge-56312

* [PR Fix] Modular_Skyrat borgos (#3019)

* No more linter complaining

* Halfway (or full way, I don't know) through moving stuff around

* Caps!

* a

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-02-05 21:28:06 +00:00
ffd03f617a [MIRROR] Fixes gorillification for radiated monkeys (#3098)
* Fixes gorillification for radiated monkeys

* a

Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:22:25 +00:00
dd4a146f90 removes the test-merge only code from the combat mode commit (#3064)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:05:21 +00:00
47343c8b69 [MIRROR] Fix Xeno Embryo tearing-stage flavour (#3102)
* Fix Xeno Embryo tearing-stage flavour (#56530)

* Fix Xeno Embryo tearing-stage flavour

Co-authored-by: esainane <esainane+github@gmail.com>
2021-02-05 17:28:30 +00:00
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
f4fd38b1a8 [MIRROR] Aquarium fish improvements (#3069)
* Aquarium fish improvements (#56573)

Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Aquarium fish improvements

* Update mapping_helpers.dm

* Update packs.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 19:36:20 +00:00
Sza'ThiandGitHub f1fa6469d6 [NON-MODULAR] Porting audible emotes from oldbase. (#2795)
* Committing a draft. Currently non-functional.

* Currently stable, a little testing left.

* Functioning as intended!

* why do i forget these thingssssss (proper comments added)
2021-02-04 17:08:32 +00:00
GandalfandGitHub db677186eb Lopland Security and Armadyne Weaponry rework [Security Medic and Sergeant] [RFT] (#2860)
* REMOVE BATONG

* Stage 2 emitters

* aaa

* aaaa

* Climb up and start the rotors

* the DOORS MASON

* Stage 3 emitters

* a

* a

* Update belt.dm

* aaaa

* more clothes

* update, wintercoat!

* Update wardrobes.dm

* Update wardrobes.dm

* test

* Better

* STAGE-4 BOIS

* No wait, it's stage 5

* aaa

* gunsets and tokens!

* hot backend stuff

* Fixes

* aaa

* QUICKDRAW!

* The smartgun

* a

* a

* a

* Map changes

* a

* Merge branch 'master' into thesecining

* Merge branch 'master' into thesecining

* PHASE 6 LADS, IT'S DONE!

* Merge branch 'master' into thesecining

* smartgun delay

* New HUD and ID cards + EMP protection system

* Create readme.md

* flashlight

* clof

* Update master.dm

* 6.5

* armadyne

* SECURITY SERGEANT AND MANY TWEAKS

* Update security.dm

* a

* Update jobs.txt

* Update security_sergeant.dm

* Report to!

* Update guns.dm

* Merge branch 'master' into thesecining

* redesign

* Update MetaStation_skyrat.dmm

* Update KiloStation_skyrat.dmm

* Update decals.dm

* It's nearly done lads.

* corpo

* a

* Update ammo.dm

* a

* Update bullets.dm

* fuxes

* Update shields.dm

* a

* Update guns.dm

* Bullet drive + fixes

* Update gunsets.dm

* Update bulletdrive.dmi

* Update hud.dmi

* fix

* fs

* a

* .

* Update bullets.dm

* aaa

* Update bullets.dm

* Update tgstation.dme

* bulletbot

* Update bulletbot.dm

* a

* oops

* fixes

* aaaa

* Update vending.dmi

* a

* seclock

* aaa

* a

* a

* a

* Update ammoboxes.dmi

* fixesa

* a

* Update guns.dm

* a

* Update guns.dm

* Peacekeeper hardsuit

* a

* a

* aaa

* Update peacekeeper_clothing.dm

* couple fixes

* Merge branch 'master' into thesecining

* hitscan laser gun

* a

* Merge branch 'master' into thesecining

* a

* a
2021-02-04 16:38:48 +00:00
fe14a074e1 [MIRROR] simple animals no longer reset their icon file on death (#3071)
* simple animals no longer reset their icon file on death (#56538)

* simple animals no longer reset their icon file on death

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-04 16:09:11 +00:00
528c8b4659 [MIRROR] Dynamic 2021 (#3070)
* Dynamic 2021 (#56221)

About The Pull Request

Dynamic 2021, among much other things, splits the threat level into two separate budgets, one for round start and one for midround/latejoin. You can read the design doc, plus methodology and charts here: https://hackmd.io/@ tgstation/S1C4dYJkO.

To server owners: this is incompatible with current dynamic.json configurations. This is not just because some fields have different values now, but because the older values are not balanced towards this system.

Inidividual list of changes (as I remember them):

    Threat level is now split into two separate budgets, one for round start and one for midround/latejoin.
    In TESTING, you can now run dynamic simulations to see the roundstart picks.
    antag_cap is now based on an equation rather than a fixed list of antags per indice--the old system is not scalable. You can now pass it either a number for a fixed constant, or a list with "denominator" and an optional "offset" to fit the equation ceil(x / denominator) + offset, with x being population.
    Midround/latejoin timers are now vars on /datum/game_mode/dynamic itself, and thus can be configured by head admins per server.
    Removes some older, as far as I can tell completely unused admin tools relating to dynamic.
    autotraitor_cooldown is now properly respected from config, and is based on an exact time rather than on ticks (450 used to be 15 minutes, now it's just 15 MINUTES).
    The rulesets dynamic chooses are now in a dynamic.json file in round logs. Relies on tgstation/tgstation13.org#64 to be public.
    Adds more logging to the autotraitor ruleset for admins.
    Midround/latejoin chance modifiers are now configurable.

Labelled "Do Not Merge", as the design doc outlines the specific playtesting schedule I would like to perform.

    Note to self: Remove the custom MOTD before merge.

Why It's Good For The Game

(Copied from design doc)

Dynamic currently dumps as much threat as it can into round start threats. This means that rounds at ~50 threat can have an absurd amount of antagonists round start, while leaving very little threat for midround/latejoin antagonists. What inevitably happens is just one of those picked decides to murderbone, leading to the inevitable 20 minute shuttle call. Furthermore, once those antagonists are dead, Dynamic doesn’t have any threat left to spend on new antagonists that keep the round flowing, promoting the mentality of “antags dead, I’m bored, let’s leave”.

The proposed solution of Dynamic 2021 is to split threat level into two separate budgets, one for round start and one for midround/latejoin. This split, like threat level, will also be done on a lorentz curve–meaning that while most rounds will have them evenly split, there is still the possibility of chaotic high antagonist round start rounds, or the possibility of a midround onslaught.

* Dynamic 2021

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-04 16:08:32 +00:00
1e1d408b7f [MIRROR] Changes fireman carrying from a trait on gloves to a skillchip (#3046)
* Changes fireman carrying from a trait on gloves to a skillchip (#56593)

* Changes fireman carrying from a trait on gloves to a skillchip

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-03 22:36:56 +00:00
64c8a4dd76 [MIRROR] adds vars for damage done by temp on simplemobs (#3042)
* adds vars for damage done by temp on simplemobs (#56572)

instead of heat and cold damage being handled by unsuitable_atmos_damage, instead its handled by unsuitable_heat_damage and unsuitable_cold_damage
if these vars arent set on the mob, they are set by default to the value of unsuitable_atmos_damage

* adds vars for damage done by temp on simplemobs

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-03 14:46:21 +00:00
c84af25020 [MIRROR] Fixes emote runtime / changes how emotes work for ghosts (#3033)
* Fixes emote runtime / changes how emotes work for ghosts (#56519)

* Fixes / refactors emotes

Crack emote no longer runtimes
Ghosts can use help emote
Exhale / inhale emote only work for living
Move beep emote living subtype
Help emote no longer tells you that you can't use it

* Remove var in arguments

Lint

* Replace loop with join

* Fixes emote runtime / changes how emotes work for ghosts

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
2021-02-03 14:23:51 +00:00
7e9d3f21ad [MIRROR] Cleans up blob code, removes a lot of hardcoded stuff, many new defines (#3029)
* Cleans up blob code, removes a lot of hardcoded stuff, many new defines (#56306)

Cleaned up, commented on, and (hopefully) improves a lot of blob code.
Put pretty much everything balance-related (except for the strains themselves) into a define file, for easier viewing, changing, and balancing.
Added a bunch of new functionality that new strains (some of which I plan to add in the future) could use: from increased expansion range to more spores per factory.

* Cleans up blob code, removes a lot of hardcoded stuff, many new defines

Co-authored-by: NotRanged <rangedvdk@gmail.com>
2021-02-03 09:23:24 +00:00
70024ef6ad [MIRROR] Reverts Adds Neon Carpet (#55782) (#3040)
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)

It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis

* Reverts Adds Neon Carpet (#55782)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-03 10:22:43 +01:00
6eeffabb76 [MIRROR] fixes wizard corpses not having beards (#3032)
* fixes wizard corpses not having beard (#56574)

"long beard" is not a beard option
replaced it with Beard (Very Long) which is the same thing
adds vars for corpses to set their hair colors
makes wizard have white beard

* fixes wizard corpses not having beards

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-02 19:05:39 +00:00
44fbbea98a [MIRROR] fixes simplemob runtime (#3011)
* Fix simplemob runtime (#56541)

Handfeeding dead simplemobs no longer runtimes.

* fixes simplemob runtime

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-01 22:43:01 +00:00
704b479f2e [MIRROR] Fix 2 wendigo runtimes (#3012)
* Fix 2 wendigo runtimes (#56540)

Fixes 2 wendigo runtimes:

- When the wendigo tries to teleport to you but there is no location to teleport it would runtimes because the code tried to pick from a empty list
- The wendigo scream message used capitalize which is not needed and also runtimed, since capitalize expects a string not some object

* Fix 2 wendigo runtimes

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
2021-02-01 22:42:54 +00:00
BluBerry016andGitHub 868f60d9bf Seperate Syndiecommss (#2948)
Useroth is stinky for accidentally making me do this again but it's cleaner code so I guess I can't be too mad
2021-02-01 00:49:06 +00:00
4539db1c75 [MIRROR] We're </span>\n now, lads. (#2980)
* We're </span>\n now, lads.

* Update mood.dm

* Update mood.dm

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-31 22:53:33 +00:00
efd87b13c4 [MIRROR] makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding (#2966)
* makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding (#56497)

the current tolerance on jousting is 2 deciseconds not enough to do fun stuff with any of the mobs you can ride on station like cows or goliaths, this is now 3
mob riding never had a keycheck so u could ride goliaths without a lasso and stuff like that

* makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-01-31 03:46:53 +00:00
bdc4069b8b [MIRROR] Miscellaneous Pronoun & Grammar Fixes (#2968)
* Miscellaneous Pronoun & Grammar Fixes (#56504)

Changes a few uses of static pronouns in dynamically generated strings to calls to the p_ procs.

* Miscellaneous Pronoun & Grammar Fixes

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
2021-01-31 03:46:21 +00:00
adfe2f099b DS-1 Assault Group + Skyrat Modular Map System [READY FOR TESTING, MODULAR] (#2317)
* START

* aaaaa

* Update assaultops.dm

* aaa

* Logic Systematic Sense

* Logic v2

* Update assaultops.dm

* Update assaultops.dm

* Update assaultops.dm

* Updates.

* Update assaultops.dm

* a

* Update radial.dmi

* Docs

* Update assaultops.dm

* Update one_click_antag.dm

* shuttle!

* Update syndicate_cruiser.dmm

* Update syndicate_cruiser.dmm

* aaaa

* Update shuttle.dm

* Update syndicate_cruiser.dmm

* aaa

* SMMS+Centcom

* Shuttles now get decals!

* Update to shuttle, centcom level!

* Update CentCom_Skyrat.dmm

* New objectives+win conditions

* a

* Merge branch 'master' into assaultops

* system updates + prison area

* Desc fix

* Delete assaultops_dynamic.dm

* a

* Update assaultops.dm

* Make Ass Team

* Update assaultops.dm

* fixes

* Update syndicate_cruiser.dmm

* watch!

* Update assaultops.dm

* Merge branch 'master' into assaultops

* super datumized

* aaaa

* nothing to see here

* Massive map changes.

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* Update syndicate_cruiser.dmm

* Merge branch 'master' into assaultops

* Merge branch 'master' into assaultops

* aaaa

* Update large_doors.dm

* aaa

* Update assaultops_gamemode.dm

* Update assaultops_datum.dm

* aa

* spawners!

* aaa

* Update assaultops_outfits.dm

* Update assaultops_spawners.dm

* Update assaultops_spawners.dm

* Update assaultops_spawners.dm

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* a

* Base alarm!

* Update base_alarm.dm

* a

* aa

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* aaa

* Update areas.dm

* aaaa

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* WOOO MORE SHIT!

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* aa

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* Update syndicate_frigate.dmm

* a

* Update CentCom_Skyrat.dmm

* Assault Ops Card Stuff (#2803)

* Automatic changelog generation for PR #2803 [ci skip]

* Assault Ops Map Tweaks (#2861)

* Update CentCom_Skyrat.dmm

* Update syndicate_frigate.dmm

* Update CentCom_Skyrat.dmm

* Update CentCom_Skyrat.dmm

* modularmaps

* duisables mining

* Removes the gosh darn Orbital Mech Pad (#2917)

Co-authored-by: BluBerry016 <50649185+unit0016@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
2021-01-30 00:32:04 +01:00
311089f611 [WIP] Combat rework - less lethality, less hardstuns, nonlethal takedowns. Focus on combat ineffectivity (#1285)
* woo

* ye

* base done

* some stuff

* weh

* bang bang

* Update carbon_defense.dm

* stuff

* Update stunbaton.dm

* flash

* Update carbon.dm

* weh

* weh

* Update stun.dm

* weh

* Update combat.dm

* a

* aaa

* a

* aaaa

* aa

* hh

* h

* Update combat.dm

* a

* Update other_reagents.dm

* a

* Update pie.dm

* Update combat.dm

* Update pie.dm

* Update combat.dm

* Update combat.dm

* Update combat.dm

* aaa

* aaa

* a

* aaa

* Update combat.dm

* Update combat.dm

* aa

* aaa

* Update carbon_defense.dm

* Update living.dm

* aaa

* Update combat.dm

* aaaa

* Update combat.dm

* aaaa

* Update combat.dm

* Update cat2_medicine_reagents.dm

* Update combat.dm

* Update misc.dm

* Update misc.dm

* Update misc.dm

* Update door.dm

* a

* Update life.dm

* aaa

* aaa

* Update code/_onclick/item_attack.dm

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

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

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

* Update code/game/objects/items/grenades/flashbang.dm

* Update modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_say.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update code/modules/surgery/bodyparts/parts.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/turfs/open/_open.dm

* Update code/game/turfs/turf.dm

* Update code/modules/antagonists/abductor/equipment/abduction_gear.dm

* Apply suggestions from code review

* Update modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_say.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-29 23:16:05 +00:00
4673d2e753 [MIRROR] Visual Indicator for Bad Touch Quirk (#2940)
* Visual Indicator for Bad Touch Quirk

* Update carbon_defense.dm

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-29 16:53:25 +00:00
262aa4aacf [MIRROR] Audible Emote Audit (#2932)
* Audits audible emotes (#56465)

Emotes have been audited for whether they should be seen or heard. No more hearing glares or seeing groans.

* Audible Emote Audit

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-29 14:13:10 +00:00
d5c0787f9e [MIRROR] Fixes mime scream a.k.a. The Silence of the Mimes (#2933)
* Fixes mime scream (#56466)

Mimes act out screams when their vow is active

* Fixes mime scream a.k.a. The Silence of the Mimes

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-29 14:12:48 +00:00
e0727dd6a4 [MIRROR] fixes various grammar issues (#2935)
* fixes various grammar issues (#56446)

fixes misspellings of 'permanently'
fixes grammar with bandaging wounds on yourself

* fixes various grammar issues

Co-authored-by: elle <54373583+dermondarble@users.noreply.github.com>
2021-01-29 12:06:57 +00:00
1a1d033bdd [MIRROR] Adds a surrender button for when you are being held at gunpoint (#2928)
* Adds a surrender button for when you are being held at gunpoint (#56393)

add: Adds a surrender button that pops up when you are at gunpoint that can be pressed to do the *surrender emote

* Adds a surrender button for when you are being held at gunpoint

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-01-28 19:28:53 +00:00
Elli-SkalaandGitHub d6ea70cdfc Update human.dm (#2921) 2021-01-28 18:19:13 +00:00