Commit Graph

576 Commits

Author SHA1 Message Date
GunHog 2b7bebb523 Advanced Energy Gun fixes
- AE gun can once again be researched more easily by forcing it to
critically fail.
- Fixed reliability rating being able to become negative.
2015-09-17 10:29:03 -05:00
Steelpoint f054521bbf FixesAndSprites 2015-09-17 11:53:12 +08:00
Xhuis 2e09024f9d Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-16 22:55:54 -04:00
Xhuis 925817539a Traitor item rebalance 2015-09-16 22:55:45 -04:00
Steelpoint e51eefbe34 MoreChanges 2015-09-16 18:00:21 +08:00
bgobandit 0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Jordie0608 f8e836ade4 moves update_icon 2015-09-14 23:30:52 +10:00
Jordie0608 d15a4cff5a rework of adv egun failure mechanic 2015-09-14 23:03:41 +10:00
Steelpoint 5783cdda03 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
Jordie 15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem
Added a taser function back to the Advanced Energy Gun
2015-09-13 21:42:45 +10:00
GunHog 34b5dbf5e7 Buffs AE Gun
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
2015-09-10 11:27:30 -05:00
Steelpoint 5a5bcbbbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
Conflicts:
	code/game/gamemodes/changeling/powers/mutations.dm
2015-09-10 23:18:39 +08:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Steelpoint 6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Cheridan 304d91fa2c Merge pull request #11606 from Firecage/gunnames
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
Firecage 2a90cd109e Stetchkin pistol rename. 2015-09-09 17:36:14 +02:00
Steelpoint a48610fbb9 MinorCHange 2015-09-08 23:20:15 +08:00
Steelpoint d6f0c2484a InitalCommit 2015-09-08 19:56:07 +08:00
Firecage 42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
Firecage 63657bb2e7 Adjusts some gun names like sugggested. 2015-09-06 18:09:42 +02:00
Firecage 1b119f6aef Fixes the russian revolver name, my mistake. 2015-09-06 14:30:43 +02:00
Firecage 56925928eb places /improper in the gun names. 2015-09-06 14:27:54 +02:00
Firecage 9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
Razharas 93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
bgobandit ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Firecage 2ee2c8513e This fixes the Syndicate Carbine. 2015-08-17 00:51:23 +02:00
Jordie0608 64ebc1f1af icon reversions 2015-07-23 18:46:01 +10:00
Jordie0608 1daaf6f713 fixes action button and m1991 icon 2015-07-23 17:13:01 +10:00
phil235 40967044cb Merge pull request #10707 from KorPhaeron/fixes
Fixes
2015-07-21 20:46:27 +02:00
KorPhaeron 65f56e146d Liberty Station fix, alien whispering fix, plasma statue logging.
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.

Fixes aliens being able to whisper to ghosts.

Adds logging to shooting plasma statues.
2015-07-19 10:31:52 -05:00
Jordie0608 e985aa05d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength
Conflicts:
	code/modules/projectiles/guns/energy/temperature.dm
2015-07-16 21:02:50 +10:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Jordie0608 9c0ef0c2ce overlays for energy guns 2015-07-15 19:06:48 +10:00
phil235 53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Ikarrus 55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
2015-06-22 22:57:53 -05:00
phil235 b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Thunder12345 608486a919 Typo fix 2015-06-17 18:55:05 +01:00
Thunder12345 275bde00ef Changed description slightly 2015-06-17 15:49:56 +01:00
Thunder12345 bfb2345726 Moved combat shotguns to shotgun/automatic/combat
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
Cheridan 7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05:00
phil235 ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Iamgoofball a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00