Commit Graph

12467 Commits

Author SHA1 Message Date
Cheridan cbe76ea2c0 Merge pull request #10598 from phil235/CatchThrownPieFix
Changes to throwing
2015-07-20 20:26:35 -05:00
Cheridan b5b642b817 Merge pull request #10699 from MrStonedOne/shuttlerotationstation
Finishes carnmc's shuttle rotation feature.
2015-07-20 17:16:05 -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
Jordie 9da05b0878 Merge pull request #10578 from AnturK/pretty
Buffs Lightning Bolt
2015-07-21 05:40:12 +10:00
MrStonedOne 8418ea6d02 fixes shuttle rotate compile error 2015-07-20 12:08:53 -07:00
MrStonedOne 9108dbba42 Makes shuttle rotate Re-Smooth's atoms if need be. 2015-07-20 12:08:30 -07:00
Incoming 11d1a6c91f Adds a few holidays to the holidays datum
Adds station prefixes for a few holidays
Holidays will now actually happen on their relevent days again, and not over a long period of time that kind of ruins the point of it being a holiDAY
Space Station 13's birthday will now actually announce how old the game is
2015-07-20 14:52:45 -04:00
Jordie0608 073b419bd3 fixes kick and ca links in pp 2015-07-21 04:21:38 +10:00
Cheridan 2dd321d349 Merge pull request #10628 from Jordie0608/thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength
Energy Guns Overlays
2015-07-20 11:57:19 -05:00
Cheridan b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix
Fixes drone and cyborg not being affected by mounted flashers.
2015-07-20 11:53:03 -05:00
bear1ake c37813e301 Merge https://github.com/tgstation/-tg-station into at_list
Conflicts:
	config/admins.txt
2015-07-20 23:24:56 +09:00
MrStonedOne 7f58d930bb Shuttle Rotation Tweaks
This should fix shuttle walls not rotating back to their old state correctly when the shuttle docks elsewhere.
Also uses built in procs and caches the calculated rotation angle to improve shuttle docking speed by not calculating it again for every object.
This should also ensure that diagonal objects rotate correctly, rather then snapping back to a cardinal direction.
2015-07-20 04:28:46 -07:00
MrStonedOne 19ef482d87 Finishes carnmc's shuttle rotation feature.
Under carn shuttles, When shuttles dock at a docking port that is not the same direction as them, they rotate their bounding box, and they do magic i don't understand to rotate where the turfs get placed.

But it doesn't rotate the items or smoothwall or handle pixel_xy or any of that.

This fixes that.

Shuttle rotation will call /atom/proc/shuttleRotate(degrees)
Default behavior handles most cases, and overrides handle edge cases.

Shuttle walls don't smooth wall or obey directions, so I just rotate their icon using matrix transform, its dirty but it works.

See: https://tgstation13.org/msoshit/powrightinthekisser.png or https://tgstation13.org/msoshit/fuckingshuttles.png
2015-07-20 04:28:45 -07:00
KorPhaeron aa69941ba8 Removes use of objectives, replaces with notes 2015-07-20 06:13:28 -05:00
Cheridan 1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05:00
Aranclanos b2f9be0e29 Merge pull request #10689 from tgstation/revert-10345-HoSArm
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-20 02:09:38 -03:00
Cheridan bcaefd28a2 Merge pull request #10675 from phil235/SlaughterDemonFixes
Slaughter demon fixes and Summoning limit
2015-07-19 23:24:51 -05:00
phil235 81255953c7 Merge pull request #10690 from duncathan/atmoshotfixes
Fixes manual valve sprites and n2o scrubbing AND ventcrawling too now
2015-07-19 22:45:54 +02:00
phil235 1bda2b6519 I hate fixing merge conflicts. 2015-07-19 21:57:51 +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
phil235 9eced1ac5b Fixes thrown closet opening to not use spawn().
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
2015-07-19 21:29:35 +02:00
duncathan 7be382cd7f fixes ventcrawling; minor cleanup of a couple other things 2015-07-19 13:13:51 -06:00
WJohn 2d3c289234 Merge pull request #10642 from MMMiracles/flukeops
removes conspiracy theory
2015-07-19 13:31:54 -04:00
Swag McYolosteinen a2f338cabf Merge pull request #10343 from GunHog/Borgie_Lights
[Review] Cyborg headlamps!
2015-07-19 19:26:09 +02:00
Swag McYolosteinen 687bfb2f71 Merge pull request #10094 from KorPhaeron/multiverse
Multiverse Sword Artefact/"There Can Be Only Me" admin verb (Ready to Merge)
2015-07-19 19:19:05 +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
KorPhaeron d8b874fc25 Golem Logging
Gives golems the name of their master in an objective so it can be
easily checked by admins when they start punching people to death or by
the golem itself when it forgets after wandering off.

Adds a warning to admins when traitors start creating golems.

Logs who creates golems.

Requested by Ausops
2015-07-19 09:18:34 -05:00
KorPhaeron 1ba58674c7 Multiverse fixes, objective tweaks, no traitor status for clones 2015-07-19 08:55:05 -05:00
Ergovisavi bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
Jordie0608 94496edb42 double whoops 2015-07-19 17:17:59 +10:00
Jordie0608 ce3ab7cdd0 whoops 2015-07-19 17:11:33 +10:00
Jordie0608 5c33bbcabf fix to show memo 2015-07-19 17:07:35 +10:00
GunHog da804d3a28 Improves code
- Links lamp button to the borg's mob for simpler updating.
- Changes intensity formula to some sort of...modulo thing that somehow
works.
2015-07-19 02:04:11 -05:00
Jordie0608 f7b66edb17 migrates admin memos to use database 2015-07-19 17:01:38 +10:00
GunHog f4407871ab Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
2015-07-18 21:56:25 -05:00
GunHog e305dafdfa Additional tweaks
- Now supports Shadowling's Veil ability.
- Fixed lamp button not updating properly when forcibly disabled.
- (Poorly) fixed cyborg eyes not glowing after recovering from a stun.
2015-07-18 21:39:31 -05:00
Cheridan d39a2ef5db Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing" 2015-07-18 07:51:17 -05:00
Carl Ivanov 0767c18cbd Add debug-verb to ingame access to AT list cords 2015-07-18 20:17:49 +09:00
Cheridan 97f9d909f1 Merge pull request #10606 from optimumtact/remove_singularity_for_teg
Remove the singularity from box and meta, replaced with TEG setups
2015-07-17 22:26:23 -05:00
Remie Richards 57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
Cheridan e4c8928de1 Merge pull request #10656 from phil235/DroneBuckleDropFix
Fixes buckled drones dropping what they're holding in their hands
2015-07-17 21:40:32 -05:00
Cheridan 4981cc19cb Merge pull request #10599 from RemieRichards/ChangelingBuffs
Changeling Buff
2015-07-17 21:35:03 -05:00
Chiefwaffles 37625502bb Fixes ANOTHER conflict. 2015-07-17 18:37:52 -07:00
Remie Richards 9394e570ae Merge pull request #10643 from KorPhaeron/soundfix
Fixes sounds cutting out halfway
2015-07-18 00:03:23 +01:00
Cheridan a4a7c21744 Merge pull request #10653 from phil235/Fixarino
Three simple fixes again
2015-07-17 15:49:41 -05:00
Cheridan 242c3e9f2f Merge pull request #10634 from Iamgoofball/patch-101
Buffs the Bioterror Chem Sprayer
2015-07-17 15:43:08 -05:00
Cheridan 41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix
Shower Fix
2015-07-17 15:34:29 -05:00
Cheridan ec2bd1d268 Merge pull request #10633 from phil235/DrinkingGlassPourFix
Some simple fixes
2015-07-17 15:22:20 -05:00