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
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
11d1a6c91f
Adds a few holidays to the holidays datum
...
Adds station prefixes for a few holidays
Holidays will now actually happen on their relevent days again, and not over a long period of time that kind of ruins the point of it being a holiDAY
Space Station 13's birthday will now actually announce how old the game is
2015-07-20 14:52:45 -04: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
19ef482d87
Finishes carnmc's shuttle rotation feature.
...
Under carn shuttles, When shuttles dock at a docking port that is not the same direction as them, they rotate their bounding box, and they do magic i don't understand to rotate where the turfs get placed.
But it doesn't rotate the items or smoothwall or handle pixel_xy or any of that.
This fixes that.
Shuttle rotation will call /atom/proc/shuttleRotate(degrees)
Default behavior handles most cases, and overrides handle edge cases.
Shuttle walls don't smooth wall or obey directions, so I just rotate their icon using matrix transform, its dirty but it works.
See: https://tgstation13.org/msoshit/powrightinthekisser.png or https://tgstation13.org/msoshit/fuckingshuttles.png
2015-07-20 04:28:45 -07:00
aa69941ba8
Removes use of objectives, replaces with notes
2015-07-20 06:13:28 -05:00
1c05fbcf6a
Merge pull request #10450 from phil235/MechRefactoring
...
Mech code refactor
2015-07-20 02:00:11 -05:00
b2f9be0e29
Merge pull request #10689 from tgstation/revert-10345-HoSArm
...
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-20 02:09:38 -03:00
bcaefd28a2
Merge pull request #10675 from phil235/SlaughterDemonFixes
...
Slaughter demon fixes and Summoning limit
2015-07-19 23:24:51 -05:00
81255953c7
Merge pull request #10690 from duncathan/atmoshotfixes
...
Fixes manual valve sprites and n2o scrubbing AND ventcrawling too now
2015-07-19 22:45:54 +02:00
1bda2b6519
I hate fixing merge conflicts.
2015-07-19 21:57:51 +02:00
94d072828f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
...
Conflicts:
code/game/atoms_movable.dm
code/game/objects/items/weapons/dice.dm
code/game/objects/weapons.dm
code/modules/flufftext/Hallucination.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/living_defines.dm
code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
Jordie
phil235
Aranclanos
kingofkosmos
bgobandit
Chiefwaffles
phil235
Swag McYolosteinen
MrStonedOne
Cheridan
Incoming5643
KorPhaeron
Ergovisavi
Incoming
xxalpha
bear1ake
