Commit Graph

1009 Commits

Author SHA1 Message Date
Jordan Brown
af13f405bd Fixes bloody footprints runtime (#28372) 2017-06-13 09:47:40 +02:00
Jordan Brown
652d7b6ade Fixes decal initialize errors (#28370) 2017-06-13 09:45:29 +02:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
ShizCalev
d46b1f7a09 Fixes basic spiderlings becoming ice spiders (#28262)
* fix

fixes #14242

* refactors ice spiders into giant_spiders.dm
2017-06-10 19:22:34 +02:00
Jordan Brown
23eb6e4aec Merge upstream 2017-06-08 16:30:35 -04:00
kevinz000
596ef51039 Merge remote-tracking branch 'tgstation/master' into gang_points_refactor 2017-06-08 11:05:12 -07:00
Jordan Brown
f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Joan Lung
405fc7b0fe Adds Prolonging Prism as an application scripture (#28164) 2017-06-07 22:43:03 -03:00
Jordan Brown
5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Joan Lung
55d4fb8cca Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power (#28108) 2017-06-06 22:18:14 -03:00
kevinz000
703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
Jordan Brown
ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Robustin
af34882816 Last Cult Master Spell: Eldritch Pulse & Various Tweaks (#27722)
* funMaster

* now teleports + telegraphs

* Update cult_comms.dm

* Delta REEEEE

* Done but still needs a couple more touches

* Update cult_comms.dm

* Finished & 150 hours tested

* Reworded

* plz dont break

* ok
2017-06-06 11:06:08 +02:00
Jordan Brown
d7ebd649ba Refactors the latejoin list (#26647) 2017-06-04 17:07:46 -03:00
AnturK
74febcf7bc Fixes bsa not showing up (#28032) 2017-06-04 09:42:50 -03:00
kevinz000
f756b6b9c2 the question is now , does this work? 2017-06-02 00:51:10 -07:00
kevinz000
6e5f20f58e thanks, robustin! 2017-06-01 23:07:07 -07:00
oranges
4493895336 Merge pull request #27879 from Cyberboss/CultFix
Fixes posters
2017-06-01 12:28:46 +12:00
Expletive
80ce91306f Some things I missed. 2017-05-30 14:31:55 -07:00
Expletive
9466b6f62c Maybe this time I won't fuck it all up 2017-05-30 14:10:54 -07:00
Cyberboss
11c6635e1b Fixes posters 2017-05-30 16:20:53 -04:00
Joan Lung
ac4da32733 Splits mining_mobs.dm into separate files (#27773)
* Splits mining_mobs.dm into separate files

* find/replace
2017-05-29 02:16:26 -04:00
Jordan Brown
1abfc03f88 Merge branch 'master' into goonchatv3 2017-05-28 16:30:33 -04:00
WJohn
5c3b433489 New syndicate cosmetics, turfs, and spawners. (#27760)
* Loads of syndicate battlecruiser related content. Clothing, turfs, areas, and a few mob spawners.

* Moves new plaque turfs and all other ones to a new plaques dmi.

* does what joan asked

* whoops forgot to add some dmis and delete one

* Adds syndicate energy turrets.

* PROBABLY STILL OKAY

* Unticks file dir?

* Forgot to remove extra sprites in shuttles.dmi since they're now in proper dmis of their own in full size.
2017-05-28 18:02:33 +01: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
Cyberboss
c3df0d5e21 Merge upstream 2017-05-26 15:32:55 -04:00
Leo
6bb099a411 Merge pull request #27521 from Cyberboss/patch-90
Removes HasProx testing message
2017-05-23 00:47:15 -03:00
Robustin
5ceb2faaea CultEffect 2017-05-22 11:37:51 -04:00
Cyberboss
f87dd5e52f Removes HasProx testing message 2017-05-21 18:33:55 -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
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Joan Lung
648e83f481 Adds framework for cult constructs having the ability to make runes (#27266) 2017-05-16 20:13:35 -03:00
TrustyGun
ac51badffd Petting is better (#27215) 2017-05-14 09:36:19 -03:00
Iamgoofball
1caf163c51 WHOSE FOOTPRINTS ARE THESE (#27190)
* WHO'S FOOTPRINTS ARE THESE

* Update humans.dm
2017-05-14 00:25:54 +12:00
Robustin
1a76285d1c Decentralization and Gang Clothes 2017-05-12 00:54:09 -04:00
Cyberboss
ffbdc49188 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-05-08 09:23:55 -04:00
Joan Lung
f17dd48f94 Merge pull request #26631 from Robustin/CultMasterAttempt2
2017 Cult Overhaul P1:  Cult Master and Datum Cult
2017-05-06 12:55:50 -04:00
Cyberboss
bcfeebb060 Merge branch 'master' into goonchatv3 2017-05-05 19:18:25 -04:00
PKPenguin321
c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
Leo
d6640544ff Merge pull request #26870 from ChangelingRain/mendingcog
Adds an effect to Mending Mantra to show who is chanting it
2017-05-04 19:48:43 -03:00
Robustin
94cd7abce3 Merge branch 'master' into CultMasterAttempt2 2017-05-04 10:41:40 -04:00
oranges
846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
Joan Lung
2729d025a3 Adds an effect to Mending Mantra to show who is chanting it 2017-05-03 19:10:36 -04:00
Lzimann
68771eae4c Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-03 12:28:28 -03:00
Joan Lung
4d1e3ce607 Merge pull request #26813 from KorPhaeron/librarian
Curator Update
2017-05-03 11:18:15 -04:00
KorPhaeron
b7864be38a Curator 2017-05-03 08:08:14 -04:00
Robustin
3423cbeba5 Finally working again 2017-05-02 19:25:49 -04:00
Lzimann
59eed8f11c Removes the gang gamemode 2017-05-02 14:28:55 -03:00
Cyberboss
5fa5e68a42 Fixes proximity sensors not tracking correctly (#26769) 2017-05-02 08:54:47 -06:00