Commit Graph

4623 Commits

Author SHA1 Message Date
Cheridan
b5b642b817 Merge pull request #10699 from MrStonedOne/shuttlerotationstation
Finishes carnmc's shuttle rotation feature.
2015-07-20 17:16:05 -05:00
Jordie
9da05b0878 Merge pull request #10578 from AnturK/pretty
Buffs Lightning Bolt
2015-07-21 05:40:12 +10: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
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05: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
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
duncathan
7be382cd7f fixes ventcrawling; minor cleanup of a couple other things 2015-07-19 13:13:51 -06: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
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
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
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
phil235
76ee0a3e1a Fixes typo in a slaughter demon message.
Fixes slaughter demon icon upon being admin healed/revived.
Add the limit var to datum/spellbook_entry to limit the amount of times it can be bought by the wizard. It's currently only used to limit wizard from summoning more than 3 slaughter demons.
2015-07-17 21:36:58 +02:00
phil235
e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers.
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
2015-07-17 17:12:16 +02:00
phil235
ed1d1c1919 Merge pull request #10620 from AnturK/mimic_fixes
Morph Fixes
2015-07-17 00:27:59 +02:00
AnturK
f1a2385443 Morph Fixes 2015-07-16 21:50:11 +02:00
phil235
87cea3c58c Fixes buckled drones dropping the stuff they're holding in their hands. 2015-07-16 16:44:42 +02:00
phil235
3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
phil235
3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
duncathan
8c2519e115 merge conflicts 2015-07-16 04:54:11 -06:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
AnturK
2693a44a80 Buffs Lightning Bolt 2015-07-16 10:57:08 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
phil235
ce101208a9 Fixes Satchel preference not working.
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
GunHog
1f7fa1aff1 Upgrades to variable lighting system + Sprites
- Moved to a variable lighting system with five lighting levels
- Added sprites for brightly lit borgies, and for the buttons by xxalpha
- Added a power drain system
- Removed a now obsolete check for flashlight item in borg inventories.
2015-07-14 16:17:58 -05:00
phil235
49f55d312a Merge pull request #10545 from Miauw62/whyareallsecborgsshitlers
Adds a huge message to sec borgs telling them not to be shitheads.
2015-07-14 15:14:16 +02:00
phil235
4c859a9ef7 Merge pull request #10497 from AnturK/bagoffixes
Fixes teleport-swap
2015-07-14 14:30:05 +02:00
Cheridan
3ca900575e Merge pull request #10489 from Shadowlight213/BraindeadAI
Adds an examine message to braindead Ais
2015-07-14 00:33:51 -05:00
Cheridan
c56a445037 Merge pull request #10580 from Ikarrus/bombarmor
Clothing with bomb armor are less likely to be shredded
2015-07-13 21:37:09 -05:00
Remie Richards
8a2ad87694 Lings now get to see the last 8 messages the person they absorbed said, to allow for better impersonations. 2015-07-14 03:20:39 +01:00
oranges
85e64ae7e0 Adds some more messages for braindamage gibbering 2015-07-14 13:18:40 +12:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
Remie Richards
6937076afe buffs to changelings:
* Changelings now regenerate chemicals while dead, up to half and ONLY HALF of their maximum storage (taking into account their storage upgrades, if applicable)
* Changelings now repair geneticdamage while dead, with the lowest value they can be taken to being 50, this number is arbitrary but was based on half the value at which fakedeath stops working for too much geneticdamage
* Changeling fakedeath timer is now halved, down from 80 seconds (1 minute 20 seconds) to 40 seconds.
2015-07-14 00:17:40 +01:00
phil235
72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
2015-07-14 01:02:37 +02:00
Swag McYolosteinen
c81d361273 Merge pull request #10143 from AnturK/ditto
Adds Morph - non-ling shapeshifter
2015-07-13 18:00:21 +02:00
Ikarrus
c3ae39a7e8 Clothing with bomb armor are less likely to be shredded
Should have been this way from the start.
2015-07-12 14:42:07 -06:00
AnturK
4c3848f279 Changelog 2015-07-12 21:58:01 +02:00
duncathan
71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
duncathan
27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06: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
68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00