cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,486 Commits 61 Branches 14 Tags
f932fac0dbdc2aa6c8246a9750e0a7db21fee5cf
Commit Graph

10176 Commits

Author SHA1 Message Date
bgobandit
f932fac0db HONK NOW IT SHOULD BE FIXED 2015-07-23 12:02:41 -04:00
bgobandit
fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
bgobandit
df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
bear1ake
97ed1728fd sync merge 2015-07-23 21:47:13 +09:00
Jordie
99814bc1b9 Merge pull request #10737 from Incoming5643/end_my_suffering 
Adds a server admin version of end round now
 2015-07-23 22:33:47 +10:00
Jordie
4ad5df84ab Merge pull request #10661 from xxalpha/changeling_vision 
Fixed changeling night vision and night vision spell.
 2015-07-23 22:22:38 +10:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix 
Handcuff, fire, overlays_standing fixes
 2015-07-23 22:21:52 +10:00
Jordie
da7f758ef3 Merge pull request #10566 from Ikarrus/hardcapqueue 
Adds a Join Queue if the server exceeds its hard population cap [Ready]
 2015-07-23 22:18:12 +10:00
Jordie
204d1e2457 Merge pull request #10574 from nullstation/hi-extended 
Changes to the crew monitoring computer
 2015-07-23 22:17:50 +10:00
Jordie
82534bb828 Merge pull request #10577 from Aranclanos/dellog 
del log verb no longer inside of the show debug verbs
 2015-07-23 21:17:56 +10:00
Aranclanos
04cf693bb7 Merge pull request #10751 from phil235/JacketStorage 
Gives the Military Jacket some suit storage options. (2)
 2015-07-23 07:51:53 -03:00
Aranclanos
cc9a7dd41e Merge pull request #10771 from phil235/ScrubberPaiFixes 
Scrubbers & pAI
 2015-07-23 07:51:01 -03:00
phil235
b5dee0558f Merge pull request #10658 from xxalpha/fixsomething 
Fixed solar assemblies not dropping into the solar panel on construct…
 2015-07-23 01:50:05 +02:00
phil235
8cfda1f2ba Leather jacket and leather overcoat can now hold the same things as military jacket. 2015-07-23 01:00:41 +02: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
phil235
24398018c3 Fixes not being able to spawn a pai manually. 
Fixes not being able to remove your inserted tank from a huge scrubber by removing the ability to insert a tank inside a huge scrubber.
 2015-07-22 15:30:31 +02: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
Incoming5643
af04cfa0b7 I almost got through a PR without any follow up commits 
but I'm using the web interface so I must be pretty cocky
 2015-07-21 14:54:35 -04:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes 
Fixes
 2015-07-21 20:46:27 +02:00
phil235
c900894030 Gives the Military Jacket some suit storage options. It can hold all the minor items that the bomber jacket can, as well as the 10mm pistol, the .357 revolver, and the .38 
Made the military jacket into an actual jacket.
 2015-07-21 18:12:31 +02: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
Incoming
59217b2b06 Adds a server admin version of end round now; a semi obscure admin tool that came about in the mulligan push but never really got advertised. It will print out a round end report and attempt to database round stats before restarting. Suggested use is when the round has SLOWED down to an unplayble crawl for some reason but the game is still technically responcive. Pressing end round doesn't preclude the use of reset if it doesn't seem to be working, but end round should usually be tried first. 
Removes the 20 second confirmation between prompts for the normal admin version of end round now.

If admins force end a round escape objectives will be good faith greentexted if the antagonists were still in a position to escape alive.

The survival rate will always be printed at round end now, even if the shuttle makes it to centcom (evac rate will be printed too in that case).
 2015-07-20 23:06:42 -04:00
xxalpha
369154a8d8 Fixed infinite solar panel exploit. 
Fixed being able to anchor solar assemblies in space.
 2015-07-21 04:01:40 +01:00
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
Jordie0608
073b419bd3 fixes kick and ca links in pp 2015-07-21 04:21:38 +10: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
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
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
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