Commit Graph

1192 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07: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
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
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
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
carlarctg
8f34bf11aa Adds inhand improvised shotgun sprites (#45995)
* the poke

* e

* wrong bracnch

* improvised spripes

* better spropes

* hoook time

* hooky

* h

* fuckkkk

* "fix"

* fuggggggggggggggg

* shit wrong pr

* fixes

* no e

* un-hooked

* more unhookinga

* added unused twohanded sprites

* Revert "Merge branch 'master' into shotgun"

This reverts commit 95caaf6270cebdc21b80659a6a0725bf37c005d1, reversing
changes made to 3cec8e8f3b188a15a495adb61f724cedd7d35246.

* Revert "Revert "Merge branch 'master' into shotgun""

This reverts commit 6677b4718f22f99befe4e9718b9b7c1f02ea6311.

* Revert "Revert "Revert "Merge branch 'master' into shotgun"""

This reverts commit 3df1e045861bb3abcebaa5b900648b016c53d620.

* Revert "Revert "Revert "Revert "Merge branch 'master' into shotgun""""

This reverts commit 8fc15d61daf40dd2ae557fdefdbd73274540cf01.

* big brain move ahead

* big brain move actuated
2019-08-22 00:23:55 -07:00
nemvar
a5e62c93b0 Fixes bulldog inhands (#45833)
* The bulldog has inhands once more.

* forgot these are a thing
2019-08-11 22:16:29 -07:00
81Denton
7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Rob Bailey
76115373b1 ballistic guns autodoc (#45578)
* ballistic guns autodoc

* fixes
2019-08-03 14:39:51 +12:00
Rob Bailey
8c36cf28a4 Better shotgun inhands (#45521)
About The Pull Request

Someone correctly pointed out to me that the other ones would need a free hand, and two hand component still isn't done yet. Whoever is working on it, get going for zero pay, and do it faster.

Since people did not like how THICC and BEEFY the inhands were as well, I made them a little shorter to make them look less like they're 7 ft long.

image
64xshottygun

This is what they're going to look like now, I'll bring back those two hand ones once the component is done eyes

for combat shotgun, regular shotgun, riot shotgun, and double barrel.
Changelog

cl
imageadd: New shotgun inhands
/cl
2019-08-01 21:19:12 +12:00
Arkatos1
23128c948e Fixes trigger restrictions for magic barrages spells (#45403) 2019-07-24 16:12:03 -07:00
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
tralezab
3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
Rob Bailey
440e1b19d2 fixes runtimes related to trash in nullspace (#45160) 2019-07-13 00:42:21 -04:00
cacogen
85ca0d5272 Adds stats to creation/destruction of cleanable decals and trash on station (#44989)
* Adds stat tracking to mess on station

* Checks for maint to make sure stats aren't counting maint trash which is irrelevant to the janitor

* adds mapload arg to init

* asdasd
2019-07-12 14:11:23 -07:00