b48eab3c43
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixingthingslikewillsmithfixedthewildwest
...
Conflicts:
icons/obj/guns/energy.dmi
2015-07-26 18:29:51 +10:00
1c59a84660
Dumb byond stuff fixed and merge conflict fixed for the gazillionth time.
2015-07-25 16:19:21 -07:00
8e97d19546
Merge pull request #10811 from Incoming5643/Take_a_number
...
Clears up define troubles for human/carbon mobs
2015-07-25 15:02:04 +02:00
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
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
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
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
6e60aa2f08
Merge pull request #10791 from phil235/BeakerFeedingFix
...
Fixes beaker feeding
2015-07-25 19:11:21 +10:00
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +10:00
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
f7e4297273
Merge pull request #10705 from KorPhaeron/golem
...
Golem Logging
2015-07-25 19:08:56 +10:00
444614dcf7
sql fixes
2015-07-25 12:05:19 +10:00
c868336e78
Removed mixing messages as they didn't make sense. Also changed istype checks to iscarbon checks.
2015-07-24 19:44:33 -04:00
864ce2c525
Added a new medication, Miner's Salve
2015-07-24 19:04:55 -04:00
8a30b30e44
&= ~ instead of -=
2015-07-25 00:19:19 +02:00
a2bbad9985
Changes mob swap to use Move(). This fixes mob swapping not respecting pass_flags and density, not making mobs slip.
2015-07-24 23:41:46 +02:00
4c25db479b
buffs out a few of the bigger holidays celibration periods
2015-07-24 13:21:02 -04:00
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
c8a5661e82
Ninja invisibility now turns off at <= 0 charge, Ninja invisibility effects moved to animate() instead of ancient anim()
2015-07-24 16:26:59 +01:00
45ebc998de
Fix
2015-07-24 19:37:55 +08:00
242ba82a50
ERTDescForAdmins
2015-07-24 19:19:36 +08:00
2e3caf5c85
Merge pull request #10736 from xxalpha/shakeitoff
...
Fixed changeling shields dropping when ling is prone.
2015-07-24 06:59:23 -03:00
fa686dbfef
Made it possible to emag a cyborg more than once.
2015-07-24 10:15:00 +01:00
8740dae264
Fix
2015-07-24 16:40:27 +08:00
66db30a73c
RifleBuff
2015-07-24 16:11:59 +08:00
407641a2c1
DSProposedChange
2015-07-24 16:09:42 +08:00
82727498b3
Removed anti-drop implant from NukeOps uplink.
2015-07-24 08:49:54 +01:00
680a560d76
Merge pull request #10783 from bgobandit/corgiburger
...
Re-adds corgi burgers.
2015-07-24 01:12:12 -05:00
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
24d17e3c97
Merge pull request #10694 from Jordie0608/mimosmemomentionsminchinsmargerymargarine
...
Database Admin Memos
2015-07-24 00:46:26 -05:00
05e227073d
Merge pull request #10782 from phil235/VendingCharges
...
Mech & vending machine fixes
2015-07-24 00:02:31 -05:00
243fbb42e3
Clears up define troubles for human/carbon mobs, leaving only the general definition of those layers in __DEFINES/misc.dm (remember, defines should be put in that folder because it's read first during compile)
...
I have no idea why this wasn't always the case
2015-07-23 18:50:23 -04:00
ac1b5e0037
Monkey recycler message now changes to reflect part upgrades.
2015-07-23 12:59:30 -04:00
7e5f3934c7
Merge pull request #10752 from phil235/HailerOverload
...
Add overload to sec hailer
2015-07-23 13:51:45 -03:00
aad97e9aa2
Fix wrong path
2015-07-24 01:12:53 +09:00
f932fac0db
HONK NOW IT SHOULD BE FIXED
2015-07-23 12:02:41 -04:00
750e5d9b5e
Changed span classes to include the re-entering link.
2015-07-23 18:58:15 +03:00
fcb081f0e1
(hopefully) fixes merge conflict, adds changelog entry
2015-07-23 11:22:49 -04:00
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
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
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
3da34d436b
Changed hailer overload, it now simply breaks the hailing system.
2015-07-23 15:02:11 +02:00
97ed1728fd
sync merge
2015-07-23 21:47:13 +09:00
ea57368e91
Non-mutant humans can no longer wag their tails.
2015-07-23 08:39:25 -04:00
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
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
b2948fcab7
Merge pull request #10659 from phil235/HandcuffOverlayFix
...
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10:00
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
204d1e2457
Merge pull request #10574 from nullstation/hi-extended
...
Changes to the crew monitoring computer
2015-07-23 22:17:50 +10:00
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
Jordie0608
Chiefwaffles
phil235
Mike Long
phil235
Incoming5643
bgobandit
Remie Richards
Steelpoint
Aranclanos
xxalpha
Cheridan
Incoming
bear1ake
kingofkosmos
MrPerson