Commit Graph

21031 Commits

Author SHA1 Message Date
Leo cb4202d220 Custom emotes no longer replace the pronouns (#27726)
Fixes #27613

Surprised it took this long to have this issue, guess no one uses the custom that much.
2017-05-28 13:55:18 +12:00
oranges 6ca501f860 Merge pull request #27725 from lzimann/incorpdefine
Changes incorporeal movement to use defines
2017-05-28 13:54:51 +12:00
Joan Lung 91022c6f29 The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it (#27728)
🆑 Joan
rscadd: The kinetic crusher can now gain bonus effects via trophy items gained by killing bosses with it.
rscadd: Yes, you do have to kill the boss primarily doing damage via the kinetic crusher, or you won't get the trophy item and the bonus effect it grants.
/🆑

The effects are relatively minor;
The dragon trophy makes mark detonation do 5 damage to and push back every other mob within 2 tiles of you.
The bubblegum trophy makes melee hits do 2 more damage and heal you for 1. This effect is increased by 500% during mark detonation, so it does 10 and heals for 5 on mark det.
The colossus trophy causes your next destabilizing force after detonating a mark to do 15 damage but move slower.
The hierophant trophy creates a 1x3 temporary(7.5 second duration) indestructible wall on your turf on mark detonation. You, your projectiles, and things you're pulling can pass this wall.
2017-05-28 13:53:59 +12:00
Leo ae20ffdb77 Merge pull request #27715 from QualityVan/bayonetbutchering
Lets bayonets butcher, fixes bayoneting typo
2017-05-27 22:47:49 -03:00
Leo cb2a2ce9ca Merge pull request #27708 from Cyberboss/outfitRefactor
Small outfit refactor
2017-05-27 22:47:02 -03:00
Leo 8d529cf7af Merge pull request #27714 from Cyberboss/patch-95
Fixes world start outfit runtime
2017-05-27 22:45:15 -03:00
cacogen b11c04ab31 Dog beds can now be renamed after new owners (#27696)
* - Dog beds now have owners
- Vacant dog beds will be given to dogs that spawn in the same area as them (e.g. Ian in the HoP's office)
- You can update a dog bed's owner by buckling any living mob to it
- Dog beds will rename to indicate a new owner
2017-05-27 22:44:04 -03:00
Leo 5f68f9183c Merge branch 'master' into hellotheremergeconflictsyouseemfamiliarhavewemetbefore 2017-05-27 22:26:15 -03:00
AnturK 272caf59a8 Fixes access lists 2017-05-27 21:43:16 +02:00
Iamgoofball cad3c194a7 The Syndicate has fired their chemist and hired a replacement. (#27710) 2017-05-27 11:47:47 -04:00
Joan Lung 9de640fbd6 Necropolis tendrils glow again (#27700) 2017-05-27 11:41:28 -04:00
Joan Lung a596fc442a Merge pull request #27611 from Robustin/GangBang
Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-05-27 10:26:53 -04:00
AnturK cf5618e31e ID card mapping aid (#27690) 2017-05-27 10:20:20 -03:00
Leo 540581e459 Merge pull request #27698 from KorPhaeron/legionfixes
Fixes legion icon
2017-05-27 10:18:58 -03:00
kevinz000 aa61650035 Pixel projectile ricochets and reflections! (#27551)
Adds flags to atoms to allow them to reflect projectiles based on that projectile's reflection chance!
(can be overridden later for angle-based chances but this is good for now, ja?)
Gives titanium walls an 80% chance to reflect beams and 30% chance to reflect everything else!
Mostly-realistic reflection angles
If the math isn't fucked (I tested and the glitches seem to be from pixel projectile movement, not the math itself), this means we can have pixel projectile reflectors soon 😂😂😂😂😂
🆑
rscadd: Nanotrasen's new titanium wall blueprints are smooth enough that it can reflect projectiles!
/🆑
https://puu.sh/vYzMA/4f00c2a4a1.gif

o ya if this goes through i'll add pixel projectile support for reflectors when i have time so we can finally dump legacy b00lits.
2017-05-27 18:13:51 +12:00
Jordan Brown 93a31e6a26 Fixes delayed login message (#27685) 2017-05-27 01:52:56 -03:00
oranges 55c0251da9 Merge pull request #27614 from Robustin/betterHUD
UPDATE: Removes airlock charge from uplink
2017-05-27 12:42:30 +12:00
Joan Lung f0687d422f Adds marker beacons to miner borgs (#27677) 2017-05-26 21:09:18 -03:00
Leo ab1999e026 Merge pull request #27681 from Cyberboss/GunInit
Ports guns to Initialize
2017-05-26 21:05:55 -03:00
Lzimann cd052863a3 Changes incorporeal movement to use defines 2017-05-26 20:43:01 -03:00
Leo 6f8c3fdf29 Merge pull request #27676 from KorPhaeron/shade
Makes shades/constructs able to speak galcommon again
2017-05-26 20:03:47 -03:00
Jordan Brown 6eb7e5a134 Fixes world start runtime 2017-05-26 16:26:25 -04:00
QualityVan a86f2fc252 Lets bayonets butcher, fixes bayoneting typo 2017-05-26 16:25:35 -04:00
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
Cyberboss 8d67264843 Small outfit refactor 2017-05-26 13:04:49 -04: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
KorPhaeron a01a567308 Fixes legion icon and spawn type 2017-05-26 08:43:06 -04:00
Jordie0608 7f09db7672 adds round id to ban table 2017-05-26 20:12:32 +10: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
Cyberboss 7a4f640eec Ports guns to Initialize 2017-05-25 19:51:08 -04:00
KorPhaeron c5b5939311 Language 2017-05-25 18:20:38 -04:00
Robustin 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
Robustin 0d575f1aa6 Sleeper Fixes 2017-05-25 14:32:51 -04: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 c7c63c89c9 Removes airlock charge from uplink 2017-05-25 00:00:44 -04: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