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

18169 Commits

Author SHA1 Message Date
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire 
Molotovs and a throw fix
 2015-07-25 20:05:05 +10:00
Jordie
a85e4747e2 Merge pull request #10808 from phil235/ActionButtonMechUpdate 
Mech action button update
 2015-07-25 19:52:10 +10:00
Jordie
0a47e37385 Merge pull request #10801 from Supermichael777/genetics-rebalence 
Modifies the hexvalues needed for mutations to have a manifestation chance
 2015-07-25 19:48:44 +10:00
Jordie
0034e5a8f3 Merge pull request #10802 from bgobandit/monkeyrecyclingfix 
Monkey recycler message now changes to reflect part upgrades.
 2015-07-25 19:47:48 +10:00
Jordie
9fbabcc305 Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe 
Change many ERROR() calls into thrown exceptions
 2015-07-25 19:22:46 +10:00
Jordie
15a36f1a4e Merge pull request #10666 from duncathan/fuck 
Restores RPD placement delay for disposals (#10645)
 2015-07-25 19:12:48 +10:00
Jordie
9b0b4e1aa4 Merge pull request #10710 from xxalpha/cablecoilbackpack 
Fixed storage not updating when joining cable coils.
 2015-07-25 19:12:26 +10:00
Jordie
3fefa5f6fa Merge pull request #10793 from bgobandit/thewaggening 
Non-mutant humans can no longer wag their tails.
 2015-07-25 19:11:50 +10:00
Jordie
6e60aa2f08 Merge pull request #10791 from phil235/BeakerFeedingFix 
Fixes beaker feeding
 2015-07-25 19:11:21 +10:00
Jordie
cd280f9d9f Merge pull request #10779 from xxalpha/rw_agent 
Made Agent IDs rewrittable.
 2015-07-25 19:11:06 +10:00
Jordie
ad2d7e1d0f Merge pull request #10789 from kingofkosmos/reentercorpselink 
Clickable re-enter corpse links
 2015-07-25 19:10:06 +10:00
Jordie
b9abbbd1fc Merge pull request #10747 from RemieRichards/DirectionHelpers 
3 New Direction Helper Procs
 2015-07-25 19:09:38 +10:00
Jordie
644bd9bbf7 Merge pull request #10727 from Incoming5643/event_flags 
Adds a few holidays to the holidays datum
 2015-07-25 19:09:10 +10:00
Jordie
f7e4297273 Merge pull request #10705 from KorPhaeron/golem 
Golem Logging
 2015-07-25 19:08:56 +10:00
Jordie0608
444614dcf7 sql fixes 2015-07-25 12:05:19 +10:00
bgobandit
473c06d147 Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 2015-07-24 17:45:03 -04:00
Cheridan
24a42d5969 Merge pull request #10765 from Dorsisdwarf/stealthkitsale 
Syndicate Fire Sale!
 2015-07-24 13:52:35 -05:00
Incoming5643
4c25db479b buffs out a few of the bigger holidays celibration periods 2015-07-24 13:21:02 -04:00
WJohn
ea2b7fa50a Merge pull request #10622 from Steelpoint/AyylienGun 
[SPRITE|MAP] Abductor Sprite and Animation Change
 2015-07-24 12:33:13 -04:00
bgobandit
0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-07-24 11:58:52 -04:00
MrPerson
619eb89a40 Add a compile time warning for out of date byond versions 
Of course none of you idiots are going to upkeep this shit so I'm not sure why I even bother

Also fixes the stuff pointed out by Miauw
 2015-07-24 06:39:12 -07:00
Aranclanos
941559822d Merge pull request #10785 from ojacobson/active-turfs-at-round-start 
Remove all the "active turfs at round start" warnings from Box
 2015-07-24 07:06:17 -03:00
Aranclanos
2e3caf5c85 Merge pull request #10736 from xxalpha/shakeitoff 
Fixed changeling shields dropping when ling is prone.
 2015-07-24 06:59:23 -03:00
Aranclanos
0ce10df78a Merge pull request #10711 from xxalpha/rcdecon 
Fixed cables floating in space after RCD decon.
 2015-07-24 06:56:34 -03:00
Steelpoint
68b5dd2979 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-07-24 16:59:21 +08:00
Cheridan
680a560d76 Merge pull request #10783 from bgobandit/corgiburger 
Re-adds corgi burgers.
 2015-07-24 01:12:12 -05:00
bgobandit
dff81b5359 Repaths corgi puppies to be a child of corgis, actually deletes pug.dm, o space jesus is this fixed yet 2015-07-24 02:04:49 -04:00
Cheridan
24d17e3c97 Merge pull request #10694 from Jordie0608/mimosmemomentionsminchinsmargerymargarine 
Database Admin Memos
 2015-07-24 00:46:26 -05:00
Cheridan
4e27d88704 Merge pull request #10762 from xxalpha/mechafab 
Changed mechfab RD console detection to oview.
 2015-07-24 00:32:27 -05:00
Cheridan
53af4ecca5 Merge pull request #10718 from Jordie0608/magnetosweaknessisthecompass 
Player report rewording
 2015-07-24 00:19:21 -05:00
Cheridan
740199f408 Merge pull request #10583 from Incoming5643/fingerbang 
[ready] Disintegrate/Flesh to Stone as actual touch attacks
 2015-07-24 00:11:44 -05:00
Cheridan
05e227073d Merge pull request #10782 from phil235/VendingCharges 
Mech & vending machine fixes
 2015-07-24 00:02:31 -05:00
Owen Jacobson
9aa5d615d0 Forcewalls and mimewalls now block atmos properly. 
They were blocking atmos before, I think? This makes the "active atmos tiles"
code at startup do the right thing, though.
 2015-07-23 23:36:50 -04:00
Owen Jacobson
3e133b610b Make rooms exposed to space more space-y by setting up atmos consistently. 
Space-exposed turfs are now at a steady state at roundstart, and fully in vacuum. Bring internals and a hardsuit.
 2015-07-23 23:36:50 -04:00
WJohn
1d48703c0e Merge pull request #10778 from bgobandit/babbysfirstcommitwhoawow 
Fixes some spelling errors and tweaks some fluff text.
 2015-07-23 19:45:47 -04:00
phil235
36c1768a77 Mech action buttons have new sprites by ZyloWalsh. 
The dark gygax now has thrusters like the marauder, so that the nuke ops don't lose in space the mech they bought.
The gygax's leg actuator overload now uses an action button.
 2015-07-24 00:24:52 +02:00
bgobandit
ac1b5e0037 Monkey recycler message now changes to reflect part upgrades. 2015-07-23 12:59:30 -04:00
Aranclanos
7e5f3934c7 Merge pull request #10752 from phil235/HailerOverload 
Add overload to sec hailer
 2015-07-23 13:51:45 -03:00
Supermichael777
6e2cf64ead Because these values were inconsitent/insane 2015-07-23 12:39:43 -04:00
bear1ake
aad97e9aa2 Fix wrong path 2015-07-24 01:12:53 +09:00
bgobandit
f932fac0db HONK NOW IT SHOULD BE FIXED 2015-07-23 12:02:41 -04:00
kingofkosmos
750e5d9b5e Changed span classes to include the re-entering link. 2015-07-23 18:58:15 +03:00
bgobandit
fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
MrPerson
471d69fcf7 Change many ERROR() calls into thrown exceptions 
This requires a 508 beta version to use. If Travis fails this he's a bitch

Exceptions will generate a stack trace, which is way easier to see and more helpful in actually solving this kind of crap. Also logs all the arguments, src, line, and file automatically.
Removed any dubiously helpful information in the exception names so the runtime condenser won't see each one as a different runtime. If the information is critical to solve these bugs (camera one maybe?), then I'll just make these warnings.
Thrown exceptions crash the currently running proc. Yes that means there's useless returns in a bunch of these, sue me. spawn()'s are to let the proc continue.

Almost all of these are difficult to trigger, but I did test playsound. And frankly even if they do cause bugs by crashing procs, big whoop
 2015-07-23 08:19:08 -07: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
phil235
1ab69f9fda Readding loading chef food into snack vending mechines. 
Adding a mention about being able to load food into snack vending machines in the cook book.
Removing the power setting of the microwave. The microwave upgrades makes it unneeded.
 2015-07-23 16:06:03 +02:00
phil235
3da34d436b Changed hailer overload, it now simply breaks the hailing system. 2015-07-23 15:02:11 +02:00
bear1ake
97ed1728fd sync merge 2015-07-23 21:47:13 +09:00
bgobandit
ea57368e91 Non-mutant humans can no longer wag their tails. 2015-07-23 08:39:25 -04:00
Jordie
5d2c9f7167 Merge pull request #10722 from Ikarrus/mindswapcheap 
Makes Body Swap a bit cheaper
 2015-07-23 22:36:10 +10:00