cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,379 Commits 61 Branches 14 Tags
b5b642b817ed02be041fe4dd22ef2ccc8fe44cbb
Commit Graph

10132 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
Cheridan
96bfea50a6 Merge pull request #10635 from Iamgoofball/patch-102 
Changes up the Bulldog Bioterror Dart
 2015-07-20 16:41:35 -05: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
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
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
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
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
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
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
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
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
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
MMMiracles
4eedf27627 Makes SWAT helmets space-proof again. 2015-07-17 14:59:47 -04: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
0f37ac3c14 Merge pull request #10601 from xxalpha/nightmaregoggles 
Fixed t-ray goggles not updating pipes&cables correctly.
 2015-07-16 19:52:22 +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
WJohn
a93dde3034 Merge pull request #10384 from Steelpoint/GasMask 
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
 2015-07-16 11:25:13 -04:00
phil235
236215b03c Fixes damp rag smothering 2015-07-16 17:20:08 +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
7f5b01c932 Derp 2015-07-16 14:14:52 +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
phil235
e968c9e03c Fixes dog bed dropping metal on deconstruction. 
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
 2015-07-16 13:04:44 +02: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
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