101eae808d
Gave Miner's salve a slight side effect when ingested, to show that it's designed to be applied, not ingested.
...
Changed secondary recipe of Miner's Salve to be a sheet of iron+ a sheet of plasma + a twinkie in a grinder. That seems more "ghetto chemistry"
Added grinder to mining station.
2015-07-26 16:18:59 -04: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
2e3caf5c85
Merge pull request #10736 from xxalpha/shakeitoff
...
Fixed changeling shields dropping when ling is prone.
2015-07-24 06:59:23 -03:00
680a560d76
Merge pull request #10783 from bgobandit/corgiburger
...
Re-adds corgi burgers.
2015-07-24 01:12:12 -05: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
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
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
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
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
ee9e59a974
WHAT ARE YOU DOING TO THAT POOR DOG
2015-07-22 21:30:15 -04: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
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
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
cbe76ea2c0
Merge pull request #10598 from phil235/CatchThrownPieFix
...
Changes to throwing
2015-07-20 20:26:35 -05:00
b5b642b817
Merge pull request #10699 from MrStonedOne/shuttlerotationstation
...
Finishes carnmc's shuttle rotation feature.
2015-07-20 17:16:05 -05:00
96bfea50a6
Merge pull request #10635 from Iamgoofball/patch-102
...
Changes up the Bulldog Bioterror Dart
2015-07-20 16:41:35 -05:00
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
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
9da05b0878
Merge pull request #10578 from AnturK/pretty
...
Buffs Lightning Bolt
2015-07-21 05:40:12 +10:00
8418ea6d02
fixes shuttle rotate compile error
2015-07-20 12:08:53 -07:00
9108dbba42
Makes shuttle rotate Re-Smooth's atoms if need be.
2015-07-20 12:08:30 -07:00
073b419bd3
fixes kick and ca links in pp
2015-07-21 04:21:38 +10:00
2dd321d349
Merge pull request #10628 from Jordie0608/thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength
...
Energy Guns Overlays
2015-07-20 11:57:19 -05:00
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
c37813e301
Merge https://github.com/tgstation/-tg-station into at_list
...
Conflicts:
config/admins.txt
2015-07-20 23:24:56 +09:00
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
Mike Long
Aranclanos
Cheridan
bear1ake
phil235
Jordie
xxalpha
bgobandit
phil235
Swag McYolosteinen
MrStonedOne
Incoming5643
Incoming