AnturK
fa35ae91d7
Allows aliens to mine
2015-07-26 20:01:52 +02:00
Jordie
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +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
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
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +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
Incoming5643
4c25db479b
buffs out a few of the bigger holidays celibration periods
2015-07-24 13:21:02 -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
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
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
05e227073d
Merge pull request #10782 from phil235/VendingCharges
...
Mech & vending machine fixes
2015-07-24 00:02:31 -05: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
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
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
xxalpha
a3e29da443
Fixed changeling shields dropping when ling is prone.
...
Fixed pathing
Better fix
Nevermind, back to what it was
2015-07-23 13:08:49 +01: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
phil235
677b24ab68
derp
2015-07-23 13:12:00 +02:00
phil235
9fab0f3641
Fixes beaker feeding not calling the right volume for the ingestion reaction.
...
Same fix for ninja suit adrenalin boost.
Simplifies reagent_containers/glass/attackby() a bit.
2015-07-23 13:05:53 +02: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
kingofkosmos
0095637eee
Clickable link added to all re-enter corpse messages.
2015-07-23 10:50:45 +03:00
bgobandit
ee9e59a974
WHAT ARE YOU DOING TO THAT POOR DOG
2015-07-22 21:30:15 -04: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
phil235
92625ba32b
Fixes goliath hide overlay on ripley not updating correctly.
...
Simplifies the code for goliath hide application on ripley mech.(adding hides var to ripley)
Fixes some mech equipment's Destroy not calling return ..()
Fixes mech sleeper not reset its patient var when ejecting the patient.
Removed unnedded update_equip_info( in sleeper/detach()
Fixes an oversight in syringe_gun/process().
2015-07-23 00:39:37 +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
Jordie0608
75e54fb036
Merge branch 'master' of https://github.com/tgstation/-tg-station into mimosmemomentionsminchinsmargerymargarine
...
Conflicts:
code/modules/admin/topic.dm
2015-07-22 15:52:51 +10: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
