Commit Graph

2433 Commits

Author SHA1 Message Date
SkyratBot
be7f35e8de [MIRROR] Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier (#4208)
* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier (#57687)

* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier instead.

* forgot the define

* actually if this is .35 it's 10 shots again so let's do that instead wow a .1 difference DOES matter fuck our health system

* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-03-17 02:21:37 +00:00
KathrinBailey
f3c8a6919b Renames 9mm and 10mm to specific cartridges. (#4054) 2021-03-12 15:02:48 +00:00
SkyratBot
e85f8a4486 [MIRROR] Replace some turf in range() with RANGETURFS and fix(?) bspace trauma (#4070)
* Replace some turf in range() with RANGETURFS and fix(?) bspace trauma (#57566)

* Replace some turf in range() with RANGETURFS and fix(?) bspace trauma

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-03-11 13:44:28 +01:00
SkyratBot
1e475b053b [MIRROR] Fixes the foam finger rocket launcher killing the server (#3912)
* don't get it (#57416)

#57013 added a foam finger that shoots rockets, and made the classic laser gatling mistake of being a ballistic gun and thus spawning 5000 rockets in its internal magazine when spawned. I don't know what this is a reference (It's a deadspace thing) to or why a foam finger was chosen for its appearance, but I do know spawning 5000 rockets is a bad idea. This avoids that issue by making it a subtype of wand (just about as good as magic anyway)

* Fixes the foam finger rocket launcher killing the server

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-06 00:57:26 +00:00
Dragonfruits
bc1c33fb17 [MODULAR] Buffs the shit out of .50 and adds a bullet rebalance module (#3848)
* Buff 50 cal and add module

* Add warning in master file

* Rebalance firing delays to accomodate changes

* Fine tuning

* Fine tuning v.2

* Apply code suggestion + fine tuning 3
2021-03-05 22:45:34 +00:00
Swiftfeather
c22f5a1043 A (#3816) 2021-03-04 17:11:32 +00:00
SkyratBot
1a7cb09623 [MIRROR] Fixes runtimes from firing projectiles, adds unit test for firing guns (#3828)
* Fixes runtimes from firing projectiles, adds unit test for firing guns (#57345)

* Fixes runtimes from firing projectiles, adds unit test for firing guns

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-04 01:02:50 +00:00
SkyratBot
89a5f7e7e4 [MIRROR] Fixes the randomly failing unit test that sometimes happens. (#3746)
* Fixes the randomly failing unit test that sometimes happens. (#57266)

* Fixes the randomly failing unit test that sometimes happens.

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-03-01 22:29:21 +00:00
SkyratBot
f5083f498b [MIRROR] *smacks table* Hot Damn! (#3734)
* *smacks table* Hot Damn! (#57269)

* *smacks table* Hot Damn!

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-01 17:49:38 +00:00
SkyratBot
3a1315edb7 [MIRROR] Move the curse hand's visual effects out of Destroy (and possibly fix the sporadic unit test failure) (#3714)
* Move the curse hand's visual effects out of Destroy (and possibly fix the sporadic unit test failure)

* Update curse.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-28 14:36:38 +00:00
SkyratBot
7b226dd6e1 [MIRROR] RangedAttack now takes modifiers. (#3706)
* RangedAttack now takes modifiers. (#57214)

* RangedAttack now takes modifiers.

Co-authored-by: Gurkenglas <gurkenglas@hotmail.de>
2021-02-28 12:25:00 +00:00
SkyratBot
0e8d991f5e [MIRROR] Poor Aim now gives you Stormtrooper Aim. (#3691)
* Poor Aim now gives you Stormtrooper Aim. (#56511)

* Poor Aim now gives you Stormtrooper Aim.

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2021-02-27 12:36:25 +00:00
SkyratBot
b8c2f72733 [MIRROR] moves gun related icons to guns folder (#3568)
* moves gun related icons to guns folder (#57077)

moves ammo icons, projectile icons and hitscan effect icons to guns folder
renames projectile.dmi to ballistic.dmi so its less confusing
moves rcd ammo from ammo.dmi to tools.dmi with the rcd

* moves gun related icons to guns folder

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-22 02:07:33 +00:00
SkyratBot
9bc6ee7bb5 [MIRROR] improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates (#3560)
* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates (#57004)

* improves fire extinguisher code, and makes fire extinguisher water go through machinery, lockers, and crates

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-21 14:17:12 +00:00
SkyratBot
8fa9c25d27 [MIRROR] added a new admeme weapon: foam finger that shoots missiles as requested by boris (now in arcades!) (#3538)
* Add a new admin weapon: foam finger that shoots missiles (#57013)

An admin only rocket firing foam finger has been added. There is also
a toy version available from arcades that is just a giant foam finger.

* added a new admeme weapon: foam finger that shoots missiles as requested by boris (now in arcades!)

Co-authored-by: c420-o <76887567+c420-o@users.noreply.github.com>
2021-02-20 16:10:33 +00:00
SkyratBot
7ddcb5573d [MIRROR] Fixes projectile damage multiplier not applying to stamina damage dealt by projectiles. (#3511)
* Fixes projectile damage multiplier not applying to stamina damage dealt by projectiles. (#57016)

* Fixes projectile damage multiplier not applying to stamina damage dealt by projectiles.

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-19 17:00:15 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
d757510356 [MIRROR] Fixes reflection of hitscan beams against tiles (#3493)
* Fixes reflection of hitscan beams against tiles (#56881)

Co-authored-by: Ranged <nickvanderkroon@ gmail.com>

* Fixes reflection of hitscan beams against tiles

Co-authored-by: NotRanged <rangedvdk@gmail.com>
Co-authored-by: Ranged <nickvanderkroon@ gmail.com>
2021-02-18 21:04:19 +00:00
SkyratBot
d2c0090c83 [MIRROR] replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time (#3478)
* replaces all instances of ammo_casing/BB to loaded_projectile again without crashing this time

* a

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 21:00:40 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
bc18a90d08 [MIRROR] Holodeck Bugs are NOT ALLOWED!!!! Fixes Issue with Holodeck Projectiles (#3427)
* Holodeck Bugs are NOT ALLOWED!!!! Fixes Issue with Holodeck Projectiles (#56933)

* Holodeck Bugs are NOT ALLOWED!!!! Fixes Issue with Holodeck Projectiles

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-16 12:13:41 +00:00
SkyratBot
0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
3f72c8b070 [MIRROR] breaching missiles breach windows and rwindows (#3329)
* breaching missiles breach windows and rwindows (#56858)

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* breaching missiles breach windows and rwindows

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2021-02-13 00:39:38 +00:00
SkyratBot
8007eb1578 [MIRROR] Refactors sharpness to use a bitfield (#3301)
* Refactors sharpness to use a bitfield (#56817)

Refactors sharpness to use bitfield instead of bitflags in case someone wants to add more types of sharp things, or unique behaviour with them

* Refactors sharpness to use a bitfield

* Update bullets.dm

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-11 23:57:06 +00:00
SkyratBot
b902f89062 [MIRROR] Refactor can_inject, and introduce try_inject (#3300)
* Refactor can_inject, and introduce try_inject (#56816)

Splits can_inject into can_inject and try_inject. The latter can perform side effects, while the former cannot. Moved the show_error bool parameter to a flag that try_inject checks.

Changes the signature to can_inject(mob/user, target_zone, injection_flags). This was previously redefined in several places, making it impossible to use named parameters. This refactor now allows named parameters to be used, and thus avoiding the ugliness of TRUE, FALSE, FALSE in parameters.

* Refactor can_inject, and introduce try_inject

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-11 19:49:47 +00:00
SkyratBot
efafc9789c [MIRROR] Fixes spellblade description (#3291)
* bloodlust (#56818)

Co-authored-by: Sparkezel <1haslo4@ gmail.com>

* Fixes spellblade description

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
2021-02-11 15:35:05 +00:00
SkyratBot
17b3cf8216 [MIRROR] fixes 2 runtimes caused by holding people up with a gun (#3283)
* fixes 2 runtimes caused by holding people up with a gun (#56800)

Fixes two runtimes, one caused by status effects always expecting a return from throw_alert, and another caused by holding yourself up (which you shouldn't even be able to do). Also fixes an issue caused by multiple people holding up the same person, when one of the perpetrators stopped holding up the victim, all of the victim's related alerts disappeared.

* fixes 2 runtimes caused by holding people up with a gun

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
2021-02-11 13:10:46 +01:00
SkyratBot
b3e8ecac81 [MIRROR] M90 changes (#3227)
* M90 changes (#56667)

The m90 is now 14tc instead of 18. Its grenades can be bought from the uplink in boxes for 6tc, instead of individual grenades for 2tc each. You can also fire the m90's grenade launcher with right click.

* M90 changes

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-09 16:49:21 +00:00
SkyratBot
367311f25f [MIRROR] Renames the _alt attacks to _secondary for clarity (#3222)
* Renames the _alt attacks to _secondary for clarity (#56752)

* Renames the _alt attacks to _secondary for clarity

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-02-09 09:45:54 +00:00
SkyratBot
e6aa8f6827 [MIRROR] Captain's gun now shoots hellfire lasers (#3175)
* Captain's gun now shoots hellfire lasers

* Update laser.dm

* Update laser.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:31:35 +00:00
Cameron!
5021730c76 Reverts changes to some traitor items (#3146) 2021-02-06 19:02:21 +00:00
YakumoChen
b9a04aa1ef More stealth descriptions (#3138)
* Update special.dm

* sr edit

* EMP flashlight

* stealthier flash

* syndie health analyzer

* thermals

* grammar
2021-02-06 14:48:52 +00:00
SkyratBot
7acbd68644 [MIRROR] Add alternate attack procs (#3134)
* Add alternate attack procs (#56663)

Adds alternate attack procs for right-clicking. Updates the gunpoint code to use this new proc as an example (though I suspect this is being changed soon, so oops).

This makes it easier to add new behavior to right click, which we should be doing.

* Add alternate attack procs

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-06 00:50:15 +00:00
SkyratBot
8bc898f14a [MIRROR] You can no longer shoot and melee with guns at the same time (#3133)
* You can no longer shoot and melee with guns at the same time (#56647)

* You can no longer shoot and melee with guns at the same time

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-06 00:10:42 +00:00
SkyratBot
a71db470d8 [MIRROR] makes blast cannons not seem like an innocent item before a bomb is loaded (#3120)
* makes blast cannons not seem like an innocent item before a bomb is loaded (#56645)

* makes blast cannons not seem like an innocent item before a bomb is loaded

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-05 22:06:05 +00:00
SkyratBot
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
SkyratBot
b5f101661d [MIRROR] You can now remove embedded objects directly with a hemostat (#3097)
* You can now remove embedded objects directly with a hemostat (#56637)

* You can now remove embedded objects directly with a hemostat

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-05 21:19:35 +00:00
SkyratBot
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
Gandalf
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
SkyratBot
f18f2ad02f [MIRROR] Pipeguns: Elitism Edition (#3054)
* Pipeguns: Elitism Edition

* fixes

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 16:25:10 +00:00
SkyratBot
1c025714e9 [MIRROR] Adds powerup system, refactors ctf pickups and powerup mine subtypes into it (#3067)
* Adds powerup system, refactors ctf pickups and powerup mine subtypes into it (#56605)

* Adds powerup system, refactors ctf pickups and powerup mine subtypes into it

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-04 16:24:10 +00:00
SkyratBot
53efc24d44 [MIRROR] cyborg disablers and cyborg t*sers are now emp-proof like the other cyborg-mounted energy-based guns are (#3056)
* cyborg disablers and cyborg t*sers are now emp-proof like the other cyborg-mounted energy-based guns are (#56481)

* cyborg disablers and cyborg t*sers are now emp-proof like the other cyborg-mounted energy-based guns are

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-04 00:15:44 +00:00
SkyratBot
b511bc53e6 [MIRROR] Makes emitters hitscan (#3047)
* Makes emitters hitscan (#56579)

* Makes emitters hitscan

* a

Co-authored-by: NotRanged <rangedvdk@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-03 22:37:40 +00:00
SkyratBot
b7d9e983ee [MIRROR] Defines calibers (#2971)
* Defines calibers (#56476)

Adds defines for all of the ammo calibers
Replaces all current magic strings with defines
Docs what guns use what calibers
Corrects the name of the incendiary .45 ammo casing to indicate that it fires incendiary rounds rather than armor piercing rounds

* Defines calibers

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-01-31 03:52:08 +00:00
Azarak
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
SkyratBot
56d1ff6325 [MIRROR] Poor Aim causes blind.eyes(1) per shot (#2936)
* Adds gun-shyness (#56463)

* Poor Aim causes blind.eyes(1) per shot

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-29 14:12:23 +00:00
SkyratBot
d581ef7a4b [MIRROR] The day has come gamers, the mosin nerf/rework (#2883)
* The day has come gamers, the mosin nerf/rework (#56319)

* THE NERF

* fixes a dumb mistake

* Sanity check and second thoughts

* mosin jamming

* adds the cleaning supplies, sprites, slight changes to dmg and jamming and HNNNG ONE LAST BUG

* adds maint kit to russian surplus, second try at fixing

* everything is fixed now :)

* finishing touches

* Last fix?

* fix

* fix var names

* a new sound and few more fixes

* add /brand_new variant to all ert/special spawned mosins, added a check if bolt is locked

* Bolt_locked is true when bolt is open 😂

* added a clamp just in case

Co-authored-by: Sparkezel <1haslo4@ gmail.com>

* The day has come gamers, the mosin nerf/rework

* Update to use our realism

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 16:17:46 +00:00