Commit Graph

20989 Commits

Author SHA1 Message Date
Jordie
f042d97448 Adds round table to replace tacking some data in feedback table (#27454)
* adds round table to replace tacking some data in feedback table

* removes obsolete code for acolytes_survived

* uses a better query

* corrects var name

* uses actual sql queries

* adds commit column and connected checks before queries
2017-05-26 22:17:44 +02:00
Joan Lung
5387d795a8 Splits up mine_items.dmi (#27669) 2017-05-26 15:19:16 -03:00
FantasticFwoosh
cadc52a033 Adds goliath cloak & a recipe (Lavaland PvE primitive item) (#27537) 2017-05-26 13:14:12 -03:00
Joan Lung
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
kevinz000
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
Leo
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
Joan Lung
c0a0947019 Refactors how diagonal smoothing underlays work (#27643) 2017-05-25 22:33:21 -03:00
Leo
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
Leo
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
AnturK
a716ed7869 Fixes adv camera leaving obscured images 2017-05-25 16:01:48 +02:00
kevinz000
019fa55775 Properly makes ID console jobslot open/close delays a config option (#27606) 2017-05-25 10:38:03 -03:00
Leo
8ff636066b Merge pull request #27625 from Cyberboss/Shrooms
Removes the shadowshroom admin message
2017-05-25 10:36:03 -03:00
kevinz000
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
Robustin
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
Leo
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
QualityVan
5cc93872d1 Improves collector feedback (#27595) 2017-05-24 20:20:15 -03:00
Leo
b14d10034e Merge pull request #27596 from ohnopigeons/plasmanerf
Nerfs plasma cost
2017-05-24 18:53:44 -03:00
Joan Lung
b3d1280dff Adds marker beacons to mining as a vendible item (#27589) 2017-05-24 18:31:44 -03:00
Leo
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
Joan Lung
f7cb6c8484 Renames a var (#27578) 2017-05-24 18:20:27 -03:00
Joan Lung
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
Leo
ccd02cc054 Merge pull request #27587 from Cyberboss/patch-92
Adds a missing null check
2017-05-24 18:16:46 -03:00
Jordan Brown
195a67374d Fixes monkeys having two Initializes and not returning a hint 2017-05-24 15:39:24 -04:00
Joan Lung
e062d8e289 Aux base plasma turrets now have range equal to the range they fire in 2017-05-24 11:44:00 -04:00
Cyberboss
d787a39b7a Removes the shadowshroom admin message 2017-05-24 09:47:41 -04:00
Leo
a11e11ecee Merge pull request #27580 from ChangelingRain/splitequipment
Splits equipment.dm into several component files
2017-05-24 10:27:29 -03:00
Leo
5123924036 Merge pull request #27579 from Cyberboss/patch-91
Fixes cryo radios
2017-05-24 10:24:00 -03:00
oranges
915b00cac6 Merge pull request #27570 from kevinz000/patch-177
fixes comment grammar
2017-05-24 22:55:35 +12:00
oranges
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
oranges
075f90590e Merge pull request #27533 from Steelpoint/ArmourPiercing
Auto Rifle Armour Piercing Increase
2017-05-24 22:53:42 +12:00
oranges
0bec7a8150 Merge pull request #27535 from Steelpoint/Sounds
Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 22:51:48 +12:00
kevinz000
df0e88cf70 Update lib_machines.dm (#27566) 2017-05-24 10:46:45 +02:00
QualityVan
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
Really-Good-Soda-Flavor
303d39af89 Fixes the meme right. (#27549) 2017-05-23 23:16:00 -06:00
QualityVan
96d997fa37 Prevents inserted inert legion cores from healing (#27554)
* Prevents inserted inert legion cores from healing

* unnecessary checks

* arguments are important
2017-05-23 23:15:01 -06:00
Steelpoint
836a81a85d Sketchin Alt Magazine Sprites (#27556)
* InitialCommit

* StraightStripes

* Vertical
2017-05-23 23:13:38 -06:00
Steelpoint
a61827d756 Tactical Energy Gun Unique Sprites (#27557)
* InitialCommit

* InitialCommit
2017-05-23 23:12:50 -06:00
Steelpoint
57489588e8 InitialCommit (#27558) 2017-05-23 23:11:30 -06:00
Ian Turk
77218ee05e Fixed some jobs not spawning with their box 2017-05-23 18:08:12 -06:00
Food
b992136191 Resolve conflicts, change name. 2017-05-23 15:43:35 -04:00
QualityVan
d0a05792c5 Brains extracted from infectious zombies keep their old species 2017-05-23 15:34:26 -04:00
Leo
c81db59d09 Merge pull request #27541 from Cyberboss/WhoReviewsThisFuckkenCode
If you're gonna make a subsystem do it right
2017-05-23 15:44:30 -03:00
Leo
13aa02f56d Merge pull request #27543 from AnturK/advanced_cam_fix
Fixes advanced cam not cleaning up properly
2017-05-23 15:43:22 -03:00
Pigeons
b1534b1ee8 Nerfs plasma cost 2017-05-23 14:28:17 -04:00
Cyberboss
b8f74b8820 Adds a missing null check 2017-05-23 10:53:28 -04:00
Leo
025cd13bf3 Closes bold tag in bombing list secret 2017-05-23 11:50:44 -03:00
Steelpoint
f1b05d8913 ForgotToRemoveThis 2017-05-23 22:36:15 +08:00
Steelpoint
916e52dde0 MoreSounds! 2017-05-23 22:32:16 +08:00
Cyberboss
babe732562 Fixes hiding the nuke disk on the arrivals shuttle 2017-05-23 09:59:44 -04:00
Joan Lung
181eb89a19 Splits equipment.dm into several component files 2017-05-23 09:50:41 -04:00