Robustin
eb7f2ddc99
Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
...
# Conflicts:
# icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
Iamgoofball
e30edf9df4
Since you can properly scrub Freon now, it doesn't destroy itself. ( #27396 )
...
# This was added because I couldn't compile tgui. Therefore, it gets to go away now since scrubbers were fixed.
2017-05-21 15:24:43 -06:00
kevinz000
9c37fa99f1
Update jetpack.dm ( #27488 )
2017-05-21 16:31:54 -04:00
Leo
2a9ab50f87
Merge pull request #27466 from Cyberboss/patch-87
...
Fixes talisman grammar
2017-05-21 16:25:27 -03:00
Steelpoint
7103172e0b
Warden Compact Combat Shotgun ( #27427 )
...
* InitalCommit
* InitialCommit
* Removal
* CloseEncounters
2017-05-21 13:44:03 -04:00
Leo
2df8f64ff0
Merge pull request #27465 from Cyberboss/patch-85
...
Adds a minor documentation comment
2017-05-21 14:09:18 -03:00
Leo
70ca3971e3
Merge pull request #27460 from AnturK/meterfix
...
Fixes built air meters not working
2017-05-21 14:08:02 -03:00
Leo
368abc321f
Merge pull request #27459 from Cyberboss/whoops
...
Fixes ordering of text2file params
2017-05-21 14:07:52 -03:00
ShizCalev
df0efe1a56
[All stations] Cleaned up var-editted areas ( #27453 )
2017-05-21 12:02:41 -03:00
Joan Lung
5c4011befd
Merge pull request #27450 from lzimann/fucking
...
Removes the mess added with recalling with a message
2017-05-21 08:56:17 -04:00
kevinz000
bea1ea06c0
Update cult_comms.dm ( #27494 )
2017-05-21 06:18:14 -04:00
Joan Lung
7db5d150de
Adds framework for kinetic accelerator projectiles having module-based effects on-hit ( #27380 )
...
* Adds framework for kinetic accelerator projectiles having module-based effects on-hit
* hmmmmm
* we have to do some weird calculation but this is... sort of easier????????
* missed one
2017-05-21 06:16:31 -04:00
RandomMarine
15c35e648d
Changed law 3 ( #27452 )
2017-05-21 06:07:24 -04:00
kevinz000
788647b8b6
Update click.dm ( #27492 )
2017-05-21 21:36:07 +12:00
KorPhaeron
7942aa4e5b
Two more types of Legion and makes environment_smash levels into defines ( #27160 )
...
One is another small legion, but it can infest corpses, meaning it will revive other legions if you don't kill it first.
The other is a legion that creates legions. I imagine it as something super edgy like a golem made up of legions melded together.
I need sprites for both of these
Added defines for environment_smash
2017-05-21 19:51:52 +12:00
Joan Lung
47fcb65362
Merge pull request #27402 from lzimann/goddamn
...
Fixes syndicate borg spawner
2017-05-20 23:19:15 -04:00
Joan Lung
7d25557bde
Survival pod doors will properly turn if on shuttles ( #27444 )
2017-05-20 23:23:06 -03:00
kevinz000
380ea858fe
fixes chameleon laser guns blowing up welding tanks for real this time ( #27443 )
2017-05-20 23:22:26 -03:00
Robustin
44bcd278dd
Merge branch 'master' into ganguns
2017-05-20 19:41:52 -04:00
Joan Lung
de45c268ed
Merge pull request #27283 from Robustin/gangclothes
...
Decentralized and Vastly Improved Gang Influence System
2017-05-20 19:36:51 -04:00
Joan Lung
fdc88ff612
Merge pull request #27435 from GunHog/Aux_Map_Fix
...
Aux Base Fixes
2017-05-20 19:33:52 -04:00
Cyberboss
20983dbc02
Fixes talisman grammar
2017-05-20 14:33:25 -04:00
Cyberboss
d15de2ff25
Adds a minor documentation comment
2017-05-20 14:28:11 -04:00
Joan Lung
0fb07d0f5a
Proto-kinetic crushers are significantly better ( #27379 )
2017-05-20 14:41:19 -03:00
Leo
8101362024
Merge pull request #27436 from AnturK/episode-nth-of-goddamit-mappers
...
Fixes buttons under doors.
2017-05-20 13:34:16 -03:00
AnturK
aa95770093
Fixes built air meters
2017-05-20 17:00:54 +02:00
Cyberboss
2132271860
Fixes ordering of text2file params
2017-05-20 10:46:50 -04:00
Leo
88e9796ed8
Merge pull request #27434 from Cyberboss/patch-88
...
Fix a bug with qdeling non-datums
2017-05-20 10:42:28 -03:00
Leo
ed522815c5
Merge pull request #27424 from Jordie0608/littledoesbyondknowtheseextensionsareexactlythesame
...
Adds .html to allowed extensions for browse_files()
2017-05-20 10:41:02 -03:00
Steelpoint
5e45849c5a
Pulse Pistol Recharge Addition ( #27426 )
2017-05-20 10:39:43 -03:00
Lzimann
49863620f2
Removes the mess added with recalling with a message
2017-05-20 02:32:01 -03:00
oranges
be8bcc6c12
Merge pull request #27393 from coiax/annoyed-admirals
...
Annoyed admirals recalling shuttles
2017-05-20 17:13:13 +12:00
Steelpoint
8b2189aa74
Tactical Energy Gun/ERT Sec Officer Change ( #27387 )
2017-05-20 01:54:06 -03:00
Joan Lung
5ac9cbe758
Merge pull request #27407 from tgstation/lzimann-patch-1
...
[s]Paper thing
2017-05-19 22:34:17 -04:00
GunHog
5635a60976
Thanks Kev
...
Reverts accidental deletion
2017-05-19 16:25:20 -05:00
Leo
af9af18e68
Merge pull request #27398 from Cyberboss/patch-85
...
IsAdminAdvancedProcCall returns FALSE in TESTING
2017-05-19 17:59:39 -03:00
Steelpoint
75d4b25796
Pulse Weapons Sprite Update ( #27386 )
2017-05-19 15:51:16 -03:00
Cyberboss
21aa98bea0
Ports folders to Initialize ( #27388 )
2017-05-19 15:48:12 -03:00
Leo
3cb94572fe
Merge pull request #27389 from Cyberboss/patch-87
...
Fixes gravity generator admin spam
2017-05-19 15:47:52 -03:00
Leo
50d4aa58ea
min
2017-05-19 14:39:55 -03:00
Joan Lung
9722f0fcf0
Merge pull request #27395 from lzimann/xeno
...
Fixes having more movespeed when xenos hug themselves
2017-05-19 13:31:47 -04:00
Robustin
d273f7afbd
ohhhhh
2017-05-19 13:23:34 -04:00
Robustin
b748100324
jobs done
2017-05-19 12:35:52 -04:00
Robustin
3e50969b00
Update portable_turret.dm
2017-05-19 12:35:05 -04:00
AnturK
b016998e3e
Fixes buttons under doors.
2017-05-19 17:50:38 +02:00
GunHog
597ec214ed
Aux Base Fixes
...
- Fixes Aux Base potentially landing partially outside the map's bounds,
leaving a chunk of it in space.
- Fixes the designator becoming inoperative after failing to lock-on to
a turf.
2017-05-19 10:45:17 -05:00
Robustin
8c68f56584
color attempt 3
2017-05-19 10:50:28 -04:00
Cyberboss
da4712029d
Fix a bug with qdeling non-datums
2017-05-19 10:49:43 -04:00
Robustin
cd36fef8d3
Update gang_items.dm
2017-05-19 10:40:39 -04:00
Robustin
e8d89cdb86
Remie changes
2017-05-19 10:36:59 -04:00
