Commit Graph

835 Commits

Author SHA1 Message Date
phil235 531334087e Merge pull request #11181 from Miauw62/sch-e-slch-schsch-schshc-sc-hschsch-schs-hcshchschschschschshcshshch-schsh-cshcsh-chschsch-s-chschscsh-cshcshcsh
Fixes ranged stuns causing slurring.
2015-08-14 11:15:41 +02:00
Swag McYolosteinen 2bb4f63023 Merge pull request #11087 from phil235/GirderSinguloPull
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
Miauw 771bf84cc1 Fixes ranged stuns causing slurring instead of stuttering. Fixes #8189 2015-08-13 12:49:18 +02:00
phil235 866cdbcd34 Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.
Rearrange girders.dm
Singularity_pull() no longer unanchors anchored objects (because it breaks the deconstruction of table/girder/states/etc, and make mech pullable by mobs), but it still pulls them.
2015-08-07 23:14:45 +02:00
phil235 bec7be024f Fixes runtime when firer is null. 2015-08-07 15:54:21 +02:00
Jordie 0b5223a687 Merge pull request #11041 from phil235/PlasmaCutterChange
Plasma cutter tweaks
2015-08-07 19:35:15 +10:00
phil235 b90fcaa765 Remove mech immobilization when shooting.
Changed the fix to delete bullets the user is on the target loc while he fires so we don't get floating bullets.
2015-08-06 16:31:30 +02:00
phil235 207fbc7cb6 Fixes being able to run into your own bullet (both as a mob or inside a mech). 2015-08-06 01:21:55 +02:00
phil235 e2ca2de4b2 Plasma cutter's fire rate is now a bit slower but its projectile can pierce multiple asteroid walls(2 for normal cutter, 3 for advanced). Its range is no longer reduced in pressurized environment (so the projectile is no longer invisible). 2015-08-05 21:58:19 +02:00
Remie Richards 5434bb7854 Merge pull request #10970 from phil235/SyringeProjShieldBlockFix
Projectile blocking fixes
2015-08-03 05:28:28 +01:00
phil235 cdd15b7c27 Removes some unneeded code(flag = "magic" when already inheriting it from parent, adding a 0 argument to on_hit when it already defaults to 0).
Fixes syringe dart not respecting shield blocking.
Projectile doesn't show the hit message anymore if 100% blocked (shield blocking mostly). (but it is still logged)

Fixes deflected dart projectiles not being logged.
2015-08-01 16:57:27 +02:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
Jordie0608 b48eab3c43 Merge branch 'master' of https://github.com/tgstation/-tg-station into fixingthingslikewillsmithfixedthewildwest
Conflicts:
	icons/obj/guns/energy.dmi
2015-07-26 18:29:51 +10:00
Jordie b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10: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
Cheridan cbe76ea2c0 Merge pull request #10598 from phil235/CatchThrownPieFix
Changes to throwing
2015-07-20 20:26:35 -05:00
Cheridan 96bfea50a6 Merge pull request #10635 from Iamgoofball/patch-102
Changes up the Bulldog Bioterror Dart
2015-07-20 16:41:35 -05:00
phil235 d2616d52fc Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms.dm
	code/game/atoms_movable.dm
2015-07-20 22:41:45 +02:00
phil235 76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
2015-07-20 22:37:06 +02:00
phil235 94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +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
phil235 d72cbcaf2f - fixes handcuff overlay on monkey not showing.
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
WJohn 3537d754b3 Merge pull request #10345 from Steelpoint/HoSArm
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04: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
Iamgoofball 76ad07805c Changes up the Bulldog Bioterror Dart 2015-07-15 06:28:16 -07:00
Jordie0608 9c0ef0c2ce overlays for energy guns 2015-07-15 19:06:48 +10:00
phil235 b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan ab7fef8082 Merge pull request #10526 from phil235/ImprovisedShotgunFix
Fixes improvised shotgun being deleted when tablecrafted.
2015-07-11 18:57:13 -05:00
phil235 68c360e136 Fixes improvised gun being deleted when tablecrafted. 2015-07-10 23:45:38 +02:00
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01: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
Jordie 8bf129cc06 Merge pull request #10336 from AlexanderUlanH/riotshotguns
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10:00
MrStonedOne a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
Ikarrus 9d92933bea Staff of change now assigns lizard name when appropriate 2015-07-06 22:04:05 -06:00
Ikarrus a949c80fee Fixes Race Swap Runtime
- Fixes Race Swap Runtime
- Staff of change now assigns lizard name when appropriate
2015-07-06 21:47:30 -06:00
Cheridan 96ff8ab617 Merge pull request #10265 from Razharas/PinRemoval
Added pin removal recipe
2015-07-04 12:50:11 -05:00
Steelpoint 2f058bbf37 ArmourPiercingRevolver 2015-07-04 00:26:08 +08:00
Swag McYolosteinen 1bdae57d30 Merge pull request #10313 from optimumtact/chickychickyrumba
Remove taser firing delay
2015-07-03 11:45:49 +02:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Alexander P. Ulan Hernandez f0d70a42b0 Rubber Shotgun Pellets
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04:00
Ikarrus 55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
oranges ae99453a72 Remove taser firing delay
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place

In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12: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
Razharas 4bea01ce34 Del pin in gun
Del pin in gun
2015-06-29 20:13:43 +03:00
Razharas 1a0c027cc2 Added pin removal recipe
Added pin removal recipe
You need plasmacutter to do it and some other shit
2015-06-29 18:43:37 +03: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