Commit Graph

2219 Commits

Author SHA1 Message Date
MrPerson
e22560a346 update_icon() improvements (#48669)
* update_icon() improvements

Fixes some update_icon() calls to properly call parent and use update_overlays() and update_icon_state().

The rest of obj/item fuck it

* Suggested fixes, also passes the linter

* I always forget . = ..() is faster than return ..() FOR SOME FUCKING REASON

* Actually this is better

* Signilzes datum/action to update its icon when its connected item does.
2020-01-11 23:46:43 -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
ArcaneMusic
bf2d1b82fd Adds a new BEPIS Major Reward, "Australicus Security Protocols" (#48600)
* The hero returns alive.

* Initial commit, boomerang batons and outback firing pins.

* Australicus is the lore in the game already, so #@$! it we'll pretend like #lore_general exists

* Name tweak.

* Fixes boomerang name, Inhands, accidently included a leftover sprite.
2020-01-10 23:17:17 +11:00
JMoldy
f811603c85 Fixes wand recharge
Self-charging wands were able to hold one extra charge by allowing the recharge counter to increase indefinitely when the number of charges reached the maximum number of charges.
2020-01-03 02:31:10 -08:00
ShizCalev
b988eddb3a Fixes firing pins not dropping when holding a gun (#48454)
* Fixes firing pins not dropping when holding a gun

* words

* fix
2019-12-31 09:23:34 -05:00
ShizCalev
9f532650b3 Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds. (#48461)
* Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds.

* fixed message
2019-12-31 09:18:33 -05:00
moo
f92eb16161 Mining Skill is Now Exclusive To Dedicated Mining Tools, Not Weapons That Double As Mining Tools. (#48237)
* gimme ur rune pick

* changes XP scaling

* beep beep

* works on my machine, 150 hours

* fixes borgs bypassing xp restriction when using KA
2019-12-22 08:36:46 +01:00
AnturK
9dd3da4445 Batch of runtime fixes. (#48268)
* Abductor implant runtime

* Point blank knockback runtime + cleanup

* dog food begging runtime

* Malf power loop runtime

* Explosive gondola pod runtime.

* Plasma shard runtime and related.
2019-12-21 18:40:10 +01:00
skoglol
4a487ca803 Refactors language holder (#48106)
* Language holder refactor

* Ironed out bugs, testing

* adds sourced language, blocking list. more useful helpers.

* Replaced old usage

* Adresses requests

* Autodoc attempt #1

* Fixed monkeyize (again)

* Travis happy

* Language menu updated

* Final pass
2019-12-18 22:22:12 +01:00
AnturK
54f32f26ad Fixes few minor runtimes. (#48234)
* Fixes emagging stuff without user

* Fixes missing initalizes

* Fixes deconstructing for materials

* Fixes tracker bullets runtime.
2019-12-14 14:15:15 -05:00
Rob Bailey
a90a158f4d Replaces some dumb usage of switch with simpler statements (#48138) 2019-12-07 11:38:17 -05:00
ShizCalev
c30dcf7d61 Fixes gun overlays not updating when the cell is deleted (#48107)
Fixes gun overlays not updating when the cell is deleted
2019-12-05 00:40:17 -08:00
plapatin
6a85a99dff adds glockroaches (#47900)
About The Pull Request

Adds glockroaches, a cockroach with a fucking gun.
Currently only obtainable through gold core spawns/admin spawning.
They drop 0.9mm ammo casing, so you know when an assistant in maintenance was murdered by a cockroach.
there's honestly not much to say about this pr
image
Why It's Good For The Game

Are you really going to argue with that cockroach? He has a fucking GUN!
2019-12-01 12:17:40 +13:00
Ryll Ryll
85de1066f0 Freeze! Adds holding people up with guns. (#47677)
About The Pull Request

Attacking someone with a gun at point blank with grab intent will now hold them at gunpoint. This means you will automatically shoot the target if they move or attack, though they're still free to rummage around in their (or your, if you continue standing next to them) inventory, speak (including using radios), and throw things. The shooter may roam around a 3 tile box radius without breaking the hold-up, allowing them to reposition themselves, though breaking visibility will break the hold-up. In addition, if you're several tiles away and they make a break for it, they may be able to dodge the projectile. Tactical choices!


For the first 3 seconds after the hold-up, any triggered reaction shot will deal normal damage.
Between 3-10 seconds after, any triggered reaction shot will deal double damage.
After 10 seconds, the reaction shot will deal 2.5x damage.

The ramp-up is to give weapons with weaker per-shot damage like disablers, laser guns, and the .38 the ability to be useful for arrests and stick ups, without affecting combat balance too much. If you got someone you're trying to kill to hold still for 2 seconds at point blank range, you may as well just keep shooting them rather than fiddle with holding them up. If you're gonna resist, it's best to do it quickly!

Lastly, if the shooter is attacked and takes damage from anything, they have a chance to flinch and fire in reaction. This is a 50% chance, unless they're hit in the arm holding the gun, in which case it's an 80% chance.

Why It's Good For The Game

Adds in mechanical backing for taking people hostage or being able to arrest people with the threat of violence rather than actually carrying out that violence. Trying to take hostages or hold people up right now will just get you immediately shove spammed mid-"DROP $500 OR FAILRP" unless the other person feels like playing along. This makes cooperating or risking getting shot an actual choice, increasing mechanical depth while also adding more roleplay potential.

Also yes, the target cuffing themselves will not trigger the reaction shot, so holding someone up, backing up, and throwing cuffs at them is a valid move.
2019-11-28 21:30:52 +13:00
KomradeSpectre
db878e848b Adds a new element, Self-Knockback. (#47938)
* Adds a new element, Self-Knockback.

* Squashes a potential edgecase runtime in projectile_selfknockback before it can even happen.

* Allows item_selfknockback to interact with dense turfs now.

* Made self-knockback utilize the Element Bespoke flag to allow custom force and speed values on attachment.

* fixes newline issue, adds a usage comment.

* fixes the newline issue in self-knockback for real this time, thanks TortoiseGit.

* i swear on god almighty if this doesn't fix the newline issue, i'll eat a shoe.

* Testing newline lint
2019-11-25 21:34:14 +00:00
ShizCalev
a16b967582 Updates energy gun overlays and inhands (#47913) 2019-11-25 17:22:58 +01:00
ShizCalev
8ec0c72946 Fix some lasers never showing as empty (#47914) 2019-11-24 12:11:05 -08:00
Firecage
730fd6729b Adds several new back slot icons for guns, while also updating two existing ones. (#47898)
* Adds back sprites for the Particle Acceleration Rifle, and updates the back sprites for the combat and riot shotguns.

* Adds adds a back slot icon for compact combat shotguns.

* Adds a back slot icon for the surplus rifle.

* Adds back slot icon for the Mosin Nagant and allows it to be worn on the back.
2019-11-23 00:00:02 +01:00
nemvar
c512c14fb7 Portals no longer use hascall. (#47889)
* Portals no longer use hascall.

* noop

* comment removals
2019-11-21 16:01:06 +00: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
py01
1782d074a8 heavy guns require a non-disabled inactive hand (#47754) 2019-11-15 23:13:40 -05:00
Firecage
aecaf54d9a Fixes the charge overlays for the m1911 pulse pistol, scatter shot laser rifle, and instakill rifles, and fixes the gunlight overlay of the mini energygun. (#47759)
* Fixes the overlays for the m1911 pulse pistol, scatter shot laser rifle, and instakill rifles.

* The mini flashlight overlay of mini energy guns now works properly.
2019-11-15 00:28:21 -08:00
carlarctg
86f1e5b0a1 fuck jannies (#47472) 2019-11-03 23:07:12 +01:00
81Denton
972ee79ffb Revive proc tweaks (#47522)
* Revive proc tweaks

* atomize PR

* Implements nemvar's suggestion
2019-11-03 01:30:22 -07:00
Shaps
06ce4cd5f9 bang bang she shot me (#47443) 2019-10-30 16:27:15 -07:00
oranges
58d8c248c8 Merge pull request #47388 from Rohesie/path
Variable definition path cleanup
2019-10-26 21:20:24 +13:00
py01
67b522fe0e increases disabler spread (#47233)
Current dual wielded disablers/lasers have very little spread, and 1-2 shots shoot straight enough to hit the tile you are clicking on at range 7 a majority of the time, which is pretty high.

With the new spread their effective range in now smaller, around 3-4 tiles.

Spread unchanged for dual wielding on the other acquirable guns.

cl
balance: Increased spread on dual wielded energy weapons.
/cl
2019-10-26 20:57:29 +13:00
L
42873d424e Cleanup 2019-10-25 04:26:09 -03: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
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
ATH1909
669ddb401c bolts of resurrection kill the undead (#47170)
* Update magic.dm

* Update magic.dm

* Update wand.dm

* Update wand.dm

* Update magic.dm

* booleanization

* bonus booleanization
2019-10-21 21:33:27 +11:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
81Denton
fa009906b5 Merge pull request #47222 from Qustinnus/buttchaps
fixes skills runtime with no minders
2019-10-20 15:10:02 +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
Unknown
08ffe39b59 fixe 2019-10-19 13:40:52 +02:00
Qustinnus
b021210a2f [READY] Adds a basic skill framework to Physiology. (Only applied to mining) (#46913)
* levels

* mining

* ore exp

* fixes

* epic

* Update code/game/turfs/simulated/minerals.dm

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

* fixes message

* dumb

* shreet

* epic

* fix

* ass

* scrape

* fixes bugs

* fixes

* reset

* test

* ??

* ok bye

* fix

* Adds skills

* skill
2019-10-18 19:59:35 -04:00
spookydonut
cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04: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
Fikou
7ca0ae8ce7 shotguns are now a heavy weapon (#47039)
* awoo

* awoo

* n

* e
2019-10-15 16:49:33 +02:00
AarontheIdiot
9c583c8faf long gun takes 2 hands 2 hold (#47081) 2019-10-15 10:20:47 -04:00
Kaffe-work
c8fe05ab1b fixes toggling flashlight removing bayonet overlay (#47053)
* fixes toggling flashlight removing bayonet overlay

* Update gun.dm

Removed useless if statement, was not needed and referenced something that wasn't intended.

His name was Jeremy Tidwell
2019-10-14 13:04:45 +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
carlarctg
0d8160938f sawn off shottie has an inhand (#47019)
Changelog

cl
fix: sawn off shotgun has inhand
/cl
2019-10-13 16:45:06 +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
Fikou
e450be44dc surgery tool refactor (#46856)
* awooooooooooooooooo

* a

* aw shet

* woops!!

* a

* wow heck you
2019-10-09 12:25:42 -04:00
William Wallace
0e1bab0869 remove duplicate var definition in /obj/projectile/bullet/p50/penetrator 2019-10-09 00:17:56 +01:00