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
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
677b24ab68
derp
2015-07-23 13:12:00 +02:00
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
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
cc9a7dd41e
Merge pull request #10771 from phil235/ScrubberPaiFixes
...
Scrubbers & pAI
2015-07-23 07:51:01 -03:00
64ebc1f1af
icon reversions
2015-07-23 18:46:01 +10:00
0095637eee
Clickable link added to all re-enter corpse messages.
2015-07-23 10:50:45 +03:00
1daaf6f713
fixes action button and m1991 icon
2015-07-23 17:13:01 +10:00
ee9e59a974
WHAT ARE YOU DOING TO THAT POOR DOG
2015-07-22 21:30:15 -04:00
eaa271b8c2
FIXES A CONFLICT THAT ISN'T EVEN MINE
2015-07-22 17:36:08 -07:00
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
8cfda1f2ba
Leather jacket and leather overcoat can now hold the same things as military jacket.
2015-07-23 01:00:41 +02:00
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
dbf46a6b29
Merge pull request #10775 from MrStonedOne/OHGODTHERUNTIMES
...
Fixes shuttle atmos causing 2gb runtime logs.
2015-07-22 19:24:03 +02:00
0aa0bc4141
OH GOD THE RUNTIMES!
...
fixes shuttles causing atmos runtimes that fill up our runtime logs
2015-07-22 09:49:32 -07:00
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
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
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
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
40967044cb
Merge pull request #10707 from KorPhaeron/fixes
...
Fixes
2015-07-21 20:46:27 +02:00
511a87724b
Move sec hailer gas mask into its own file
...
Adding overload when spamming the sec hailer. Burn damage for the user except if silicon (em pulse instead).
2015-07-21 19:34:04 +02:00
99bfeb75b5
Replaces usr with user
2015-07-21 12:17:46 -05:00
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
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
e6a8511ac1
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:50:02 -07:00
5f6cf57e07
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:32:08 -07:00
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
369154a8d8
Fixed infinite solar panel exploit.
...
Fixed being able to anchor solar assemblies in space.
2015-07-21 04:01:40 +01:00
bgobandit
Cheridan
Incoming
Aranclanos
bear1ake
kingofkosmos
MrPerson
phil235
Jordie
xxalpha
Chiefwaffles
phil235
Swag McYolosteinen
MrStonedOne
Incoming5643
KorPhaeron
Ergovisavi