Commit Graph

18027 Commits

Author SHA1 Message Date
xxalpha
1759d492f0 Made Agent IDs rewrittable.
Added antag check for forging.
2015-07-22 22:38:13 +01:00
Swag McYolosteinen
dbf46a6b29 Merge pull request #10775 from MrStonedOne/OHGODTHERUNTIMES
Fixes shuttle atmos causing 2gb runtime logs.
2015-07-22 19:24:03 +02:00
MrStonedOne
0aa0bc4141 OH GOD THE RUNTIMES!
fixes shuttles causing atmos runtimes that fill up our runtime logs
2015-07-22 09:49:32 -07:00
Cheridan
94871c12a9 Merge pull request #10725 from Jordie0608/afkplayersareworth1pointafkadminsareworth5
Fixes Kick and Check Antagonist links in Player Panel
2015-07-22 00:37:35 -05:00
Aranclanos
47706cf88b Merge pull request #10717 from Ikarrus/thisisafix
Fixes Reset and Purge having "This is a bug." law on examine
2015-07-21 16:12:43 -03:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes
Fixes
2015-07-21 20:46:27 +02:00
KorPhaeron
d1dec3ffec Changed on phil's comments 2015-07-21 12:20:15 -05:00
phil235
452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
Cheridan
58bb48c758 Merge pull request #10662 from Fayrik/GotTooManyBranches
Massive Donksoft sale!!! Our prices cannot be matched!
2015-07-20 20:33:47 -05:00
Cheridan
cbe76ea2c0 Merge pull request #10598 from phil235/CatchThrownPieFix
Changes to throwing
2015-07-20 20:26:35 -05:00
Cheridan
c31e8764c0 Merge pull request #10726 from xxalpha/smoothballs
Readds spawn() proc to icon smoothing code.
2015-07-20 17:16:43 -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
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
xxalpha
c88e901a1b Readds spawn() proc to icon smoothing code. 2015-07-20 19:48:37 +01:00
Jordie0608
073b419bd3 fixes kick and ca links in pp 2015-07-21 04:21:38 +10:00
Ikarrus
bc5eac33a8 Needs a check here to let reset and purge be used. 2015-07-20 09:02:46 -06: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
99c5d75cef Adds check for firer being null 2015-07-20 06:07:17 -05:00
Swag McYolosteinen
2d6585fe47 Merge pull request #10714 from Cheridan/miauw_you_butthead
Character Limit Fix
2015-07-20 09:26:51 +02:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05:00
Ikarrus
ec3677da2d Fixes Reset and Purge having "This is a bug." law on examine
No reason to have this string as far as I can tell.
2015-07-19 23:20:04 -06: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
Cheridan
a3b0ff8aa0 Merge pull request #10603 from xxalpha/smoothballs
Removed spawn from smooth() proc.
2015-07-19 18:56:02 -05:00
Cheridan
39f6962642 Character Limit Fix
#9902 replaced /proc/strip_html_properly but the new code didn't actually have the character length check that the proc had.
I don't know if trim() is the best place for it or to put it in its own proc but I assume this was Miauw's intent because he is passing max_length into it.
2015-07-19 17:06:47 -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
2833f59f5f A typo and a forgotten thing to do. 2015-07-19 22:16:09 +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
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
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
001dd150e0 Merge pull request #10655 from MMMiracles/TWANG
Adds a 'TWANG' sound effect for guitars
2015-07-19 13:34:40 -04:00
WJohn
2d3c289234 Merge pull request #10642 from MMMiracles/flukeops
removes conspiracy theory
2015-07-19 13:31:54 -04:00
WJohn
b96c98d1b6 Merge pull request #10709 from cdepatie/patch-1
saving atmos one letter at a time
2015-07-19 13:30:25 -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
fd833342cf Removes processing from multisword
Thanks Miauw
2015-07-19 12:08:47 -05:00
Caden Depatie
b5131b49dd saving atmos one letter at a time
fixes a typo that prevents the nanoUI coming up when interacting with the gas mixer
2015-07-19 12:28:41 -04:00
Swag McYolosteinen
0f244730bc Merge pull request #10626 from Ikarrus/lizardmov
AI Module Updates
2015-07-19 18:06:06 +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
1ba58674c7 Multiverse fixes, objective tweaks, no traitor status for clones 2015-07-19 08:55:05 -05: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
GunHog
c8a1b71bd9 Support Shadowling Veil (again)
- Re-add veil support.
2015-07-18 22:10:45 -05:00