Commit Graph

9344 Commits

Author SHA1 Message Date
Joan Lung
1437f03a3f Merge pull request #27733 from lzimann/lolgs
Individual logs are no longer lost with mob changes
2017-05-27 23:41:53 -04:00
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
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
Joan Lung
9de640fbd6 Necropolis tendrils glow again (#27700) 2017-05-27 11:41:28 -04:00
Joan Lung
5840aadb57 Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping 2017-05-27 10:02:26 -04:00
Lzimann
84ecf120b9 Better 2017-05-27 10:46:10 -03:00
Leo
540581e459 Merge pull request #27698 from KorPhaeron/legionfixes
Fixes legion icon
2017-05-27 10:18:58 -03:00
Jordan Brown
93a31e6a26 Fixes delayed login message (#27685) 2017-05-27 01:52:56 -03:00
Lzimann
8b14ea1aeb This way is better 2017-05-27 01:06:52 -03:00
Lzimann
d37c2c12f7 Individual logs are no longer lost with mob changes 2017-05-27 01:04:40 -03:00
Joan Lung
f0687d422f Adds marker beacons to miner borgs (#27677) 2017-05-26 21:09:18 -03:00
Lzimann
cd052863a3 Changes incorporeal movement to use defines 2017-05-26 20:43:01 -03:00
Cyberboss
c3df0d5e21 Merge upstream 2017-05-26 15:32:55 -04:00
cacogen
1a1682bc44 Adds AI follow links to PDA messages and holopad speech 2017-05-27 04:44:29 +12:00
KorPhaeron
a01a567308 Fixes legion icon and spawn type 2017-05-26 08:43:06 -04: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
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
Jordan Brown
195a67374d Fixes monkeys having two Initializes and not returning a hint 2017-05-24 15:39:24 -04: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
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
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
Cruix
e95a2ac36b Replaced mob spawner vars with outfits (#27534) 2017-05-23 09:57:17 -03:00
kevinz000
b27220dd16 Fixes space movement exploit (#27514) 2017-05-23 00:46:18 -03:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
Joan Lung
d11373283c Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls (#27409) 2017-05-23 00:20:29 -03:00
ShizCalev
82d5e8a51a Area Refactor + Var-edit Cleanup (#27530) 2017-05-23 00:07:48 -03:00
Robustin
5569c259ab Merge branch 'master' into culttweaks2 2017-05-22 10:36:57 -04:00
ClosingBracket
133340aa0b Fixed very minor capitalization and punctuation inconsistencies. (#27490) 2017-05-22 09:25:27 -03:00
Really-Good-Soda-Flavor
41294bd58d Reorganizes martial arts and stores them in the MIND. (#27324)
* Reorganizes martial arts and stores them in the MIND.

* Moves martial arts to mind.

* Added more sanity checks

* MORE sanity checks!

* Fixes the checks.
2017-05-22 14:12:27 +02:00
Food
e961199fdb Initial beach-language commit 2017-05-21 21:49:32 -04:00
Leo
795622fac1 Merge pull request #27473 from swindly/monkey_nerf
Nerfs monkeys
2017-05-21 20:28:03 -03:00
RandomMarine
15c35e648d Changed law 3 (#27452) 2017-05-21 06:07:24 -04: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
swindly
31f2942e8d nerfs monkeys 2017-05-20 18:04:20 -04:00
Robustin
425e8fca71 Fixes galore 2017-05-19 18:20:48 -04: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
Lzimann
88838ce67c Clamp 2017-05-19 08:18:21 -03:00
4DPlanner
c87e6f85ec Merge remote-tracking branch 'upstream/master' into clubbuff 2017-05-18 21:52:31 +01:00
Lzimann
521c67389b Fixes having more movespeed when xenos hug themselves 2017-05-18 14:37:54 -03:00
kevinz000
16b44c2937 [READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234)
* fields

* peaceborg dampeners

* hm

* nerfs recharge

* ...

* fffff

* objectively fields

* kinda_working

* why is this not working

* cheep

* bugfixes, adds to robot

* cross doesn't work ;-;

* on border

* appearance

* hi, is this a refactor?

* ffs

* ree

* monitor

* monitor

* hm

* all good

* Update robot_items.dm
2017-05-18 10:53:55 -06:00
AnturK
7dd00e28ac Fixes bane runtimes (#27368)
* Fixes bane runtimes

* You're a big typo
2017-05-18 10:31:08 -06:00
Joan Lung
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
4DPlanner
1270c10082 Hierophant boss deals double damage to intruders 2017-05-17 17:50:24 +01:00
4DPlanner
586ec27ac3 Damage is now consistent across lavaland and non-lavaland mobs, and
teleport never friendly fires
2017-05-17 17:05:52 +01:00
4DPlanner
07768b376f Buffs hierophant club 2017-05-17 16:36:22 +01:00
QualityVan
b27665d293 Adjusts ear/eye protection based on missing organs (#27291) 2017-05-16 09:07:35 +02:00
Robustin
3f47e55fe1 Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#27085)
* Chosen Harvesters

* Update runes.dm

* New Cult Ending

* New Cult Ending

* Cinematics added

* A couple fixes

* Update ticker.dm

* Final Touches

* Done

* Desc fix

* Update alert.dm

* Update cult_comms.dm

* requested changes

* Update uplink_item.dm

* Update alert.dm

* Update runes.dm

* Update runes.dm

* fuckinglaunchpad

* Update machine_designs.dm

* Fucking launchpad errors

* Update narsie.dm

* Update mode.txt

* moves a few pixels on the sprite for Joan

* whatever just merge it

* You know whats BS?

* While you're at it... merge this shit

* Update living_defense.dm

* Update constructs.dm

* Update living_defense.dm
2017-05-16 08:50:46 +02:00