Commit Graph

22290 Commits

Author SHA1 Message Date
Steelpoint 03b31490dd [Lavaland Ruin] Crashed Marine Transport (#27660)
* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk
2017-05-28 10:30:17 -04:00
Leo 1bf60eb89e Merge pull request #27758 from ChangelingRain/mousedrake
Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping
2017-05-28 10:41:26 -03:00
Joan Lung b7945f5b4c Merge pull request #27706 from cacogen/aifollowlinks
Adds AI follow links to PDA messages and holopad speech
2017-05-28 09:14:17 -04:00
Joan Lung e5882369c3 Merge pull request #27743 from Cyberboss/patch-98
Ports cable structures to Initialize
2017-05-28 09:12:39 -04:00
Joan Lung c5ebdb2e46 Merge pull request #27735 from lzimann/computer
Ports modular computers to initialize
2017-05-28 09:11:05 -04:00
bgobandit 6440da5542 if this breaks ian joan i swear to god 2017-05-28 08:49:36 -04:00
bgobandit 0992018ce5 You can pet dogs again. 2017-05-28 08:36:35 -04:00
Profakos f0f278e2c6 Fixes immoveable rods 2017-05-28 11:20:29 +02:00
Jordie0608 0f914e4233 adds coalesce to world.internet_address 2017-05-28 15:46:35 +10:00
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
Joan Lung 03e006eb05 Fixes mesons giving the wrong message when toggling off 2017-05-27 22:10:02 -04:00
oranges 12f6ef45ff Merge pull request #27697 from KorPhaeron/z2
Centcomm is on Z1
2017-05-28 13:57:00 +12:00
oranges 5c339c13e8 Merge pull request #27731 from lzimann/toomany
Fixes a runtime with contraband crates
2017-05-28 13:56:08 +12: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
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
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
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 2fdd8a630e Ports cable structures to Initialize 2017-05-27 02:04:33 -04:00
Jordan Brown 93a31e6a26 Fixes delayed login message (#27685) 2017-05-27 01:52:56 -03:00
Lzimann 5bd06e126f Ports modular computers to initialize 2017-05-27 01:17:55 -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
Lzimann 62b6e5bd27 Fixes a runtime with contraband crates 2017-05-26 23:22:15 -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
Cyberboss 42be7a34f9 Fix dept stylesheet 2017-05-26 16:16:41 -04:00
Cyberboss 09e63f633c Another fix 2017-05-26 16:08:47 -04:00
Cyberboss e3495fa034 Remove debug code fix bugs 2017-05-26 16:05:36 -04:00
Cyberboss 2addb941eb Cleans up to_chat 2017-05-26 15:53:14 -04:00
Cyberboss 705beac0da Make bicon_cache static 2017-05-26 15:46:31 -04:00
Cyberboss 71a72f8c96 Makes bicon param less stupidly named 2017-05-26 15:38:00 -04:00