Commit Graph

2200 Commits

Author SHA1 Message Date
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
William Wallace
45f2feda3b replace extra icon_state with item_state in /obj/item/gun/ballistic/rifle 2019-10-09 00:15:41 +01:00
William Wallace
076e532e65 remove duplicate var definitions in /obj/item/gun/magic 2019-10-09 00:13:11 +01: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
Fikou
338dca92b3 meteorslugs now knockdown instead of stunning (#46763)
* h

* meh why not

* ok bobby
2019-10-05 13:22:16 -04:00
Firecage
3996aaa197 Lets Syndi Mediborgs and Syndi Engiborgs get some of the upgrades of normal Mediborgs and Engiborgs. (#46760) 2019-10-03 02:17:17 -07:00
81Denton
8cfe0b3ccf Soul stone tweaks (#46765)
* Soul stone tweaks

* h

* fuck
2019-09-30 14:27:55 -04: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
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
nemvar
5c49cc4968 Fixes tesla projectile chain (#46693) 2019-09-24 17:53:30 -04:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
nemvar
8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00
ArcaneMusic
1e97c21bfb Fixes the Advanced Plasmacutter Inhand (#46528)
* Fixes the Advanced Plasmacutter Inhand

* 4th try now

* No wait I like datums please dont
2019-09-16 01:53:32 -04:00
skoglol
280741a839 Point blank execution shots now hit head (#46421)
* Point blank execution shots now hit head.

* Update code/modules/projectiles/gun.dm

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>
2019-09-15 00:33:01 -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
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
Fhaxaris
6d4bddcc55 makes riot darts work (#46307)
* if it has an effect, that counts as doing damage ok?

* Update damage_procs.dm

* that does not fix that

* i meant to remove that
2019-09-02 23:53:44 -07: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