c3df0d5e21
Merge upstream
2017-05-26 15:32:55 -04:00
5387d795a8
Splits up mine_items.dmi ( #27669 )
2017-05-26 15:19:16 -03:00
8d67264843
Small outfit refactor
2017-05-26 13:04:49 -04:00
1a1682bc44
Adds AI follow links to PDA messages and holopad speech
2017-05-27 04:44:29 +12:00
cadc52a033
Adds goliath cloak & a recipe (Lavaland PvE primitive item) ( #27537 )
2017-05-26 13:14:12 -03:00
843ee5f7c0
Merge pull request #27658 from AnturK/alright-i-give-up-ill-rewrite-this-tomorrow
...
Fixes adv camera leaving obscured images
2017-05-26 10:05:30 -04:00
af2aeef3d0
Use defines
2017-05-26 09:04:09 -04:00
a01a567308
Fixes legion icon and spawn type
2017-05-26 08:43:06 -04:00
7f09db7672
adds round id to ban table
2017-05-26 20:12:32 +10:00
d536bf6caf
[READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too ( #27416 )
...
* hm
* separation part 1
* fixes and more fixes
* gunlight minirefactor
* refactor
* done
2017-05-26 10:37:10 +02:00
5d02d4b9d1
Merge pull request #27638 from Cyberboss/patch-96
...
Fixes monkeys having two Initializes and not returning a hint
2017-05-25 22:33:41 -03:00
c0a0947019
Refactors how diagonal smoothing underlays work ( #27643 )
2017-05-25 22:33:21 -03:00
7a4f640eec
Ports guns to Initialize
2017-05-25 19:51:08 -04:00
c5b5939311
Language
2017-05-25 18:20:38 -04:00
143e3fe2f4
Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest
...
# Conflicts:
# icons/obj/ammo.dmi
2017-05-25 14:35:25 -04:00
0d575f1aa6
Sleeper Fixes
2017-05-25 14:32:51 -04:00
3d2aca11cd
Merge pull request #27630 from ChangelingRain/plasmaray
...
Aux base plasma turrets now have range equal to the range they fire in
2017-05-25 12:37:04 -03:00
67d7a548b6
Merge pull request #27582 from Cyberboss/NukeDiskFix
...
[s] Fixes hiding the nuke disk on the arrivals shuttle
2017-05-25 11:43:21 -03:00
a716ed7869
Fixes adv camera leaving obscured images
2017-05-25 16:01:48 +02:00
019fa55775
Properly makes ID console jobslot open/close delays a config option ( #27606 )
2017-05-25 10:38:03 -03:00
8ff636066b
Merge pull request #27625 from Cyberboss/Shrooms
...
Removes the shadowshroom admin message
2017-05-25 10:36:03 -03:00
8575bad94b
fixes AOE projectile automatic proximity detonation ( #27565 )
...
* Update magic.dm
* Update magic.dm
* Update magic.dm
* Update magic.dm
* Update magic.dm
2017-05-25 14:28:49 +02:00
c7c63c89c9
Removes airlock charge from uplink
2017-05-25 00:00:44 -04:00
4db0385ff1
4th Attempt at 60% shuttle recall gang murderbone thing ( #27414 )
...
Still very important, still a victim of Github memes.
Tried to push to Militairies version but it had like a million commits so fuck that. This accounts for Jordie0608's requested changes. The latest changes moves the "no recall" aspect to the emergency shuttle subsystem so now any future code can simply set SSshuttle.emergencyNoRecall to TRUE if they want to prevent recalls from taking place.
See #27228 for references to the last 3 PR's.
tweak: Gang mode now calls a 4 minute unrecallable shuttle once 60% of the crew is dead
2017-05-25 12:20:44 +12:00
4cb21f3f8b
Merge pull request #27607 from Cruix/box_fix
...
Fixed some jobs not spawning with their box
2017-05-24 20:29:03 -03:00
5cc93872d1
Improves collector feedback ( #27595 )
2017-05-24 20:20:15 -03:00
b14d10034e
Merge pull request #27596 from ohnopigeons/plasmanerf
...
Nerfs plasma cost
2017-05-24 18:53:44 -03:00
b3d1280dff
Adds marker beacons to mining as a vendible item ( #27589 )
2017-05-24 18:31:44 -03:00
e464497158
Merge pull request #27599 from QualityVan/zombiebrains
...
Brains extracted from infectious zombies keep their old species
2017-05-24 18:29:54 -03:00
f7cb6c8484
Renames a var ( #27578 )
2017-05-24 18:20:27 -03:00
17f44707c2
Merge pull request #27586 from tgstation/lzimann-patch-1
...
Closes bold tag in bombing list secret
2017-05-24 17:18:06 -04:00
ccd02cc054
Merge pull request #27587 from Cyberboss/patch-92
...
Adds a missing null check
2017-05-24 18:16:46 -03:00
195a67374d
Fixes monkeys having two Initializes and not returning a hint
2017-05-24 15:39:24 -04:00
21d5ea2e3d
Update bullets.dm
2017-05-24 12:46:12 -04:00
9ceada6c66
Sleeper Icon
2017-05-24 12:34:38 -04:00
d9a696b19b
sleeper round
2017-05-24 12:33:36 -04:00
5097c5ab9a
Update external_mag.dm
2017-05-24 12:24:13 -04:00
df722ce8d7
Update external_mag.dm
2017-05-24 12:23:23 -04:00
b0e081db2f
Update ammo_casings.dm
2017-05-24 12:17:54 -04:00
e062d8e289
Aux base plasma turrets now have range equal to the range they fire in
2017-05-24 11:44:00 -04:00
d787a39b7a
Removes the shadowshroom admin message
2017-05-24 09:47:41 -04:00
a11e11ecee
Merge pull request #27580 from ChangelingRain/splitequipment
...
Splits equipment.dm into several component files
2017-05-24 10:27:29 -03:00
5123924036
Merge pull request #27579 from Cyberboss/patch-91
...
Fixes cryo radios
2017-05-24 10:24:00 -03:00
915b00cac6
Merge pull request #27570 from kevinz000/patch-177
...
fixes comment grammar
2017-05-24 22:55:35 +12:00
72cc75478f
Merge pull request #27528 from Really-Good-Soda-Flavor/Beach-BUMS
...
Adds the Beach Bum Language
2017-05-24 22:54:05 +12:00
075f90590e
Merge pull request #27533 from Steelpoint/ArmourPiercing
...
Auto Rifle Armour Piercing Increase
2017-05-24 22:53:42 +12:00
0bec7a8150
Merge pull request #27535 from Steelpoint/Sounds
...
Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 22:51:48 +12:00
df0e88cf70
Update lib_machines.dm ( #27566 )
2017-05-24 10:46:45 +02:00
a2c0e7e592
Water wets hide, you can microwave wet leather ( #27546 )
...
* Water wets hide, you can microwave wet leather
* microwave output
2017-05-23 23:18:20 -06:00
303d39af89
Fixes the meme right. ( #27549 )
2017-05-23 23:16:00 -06:00
Cyberboss
Joan Lung
cacogen
FantasticFwoosh
KorPhaeron
Jordie0608
kevinz000
Leo
Robustin
AnturK
QualityVan
oranges
Really-Good-Soda-Flavor