Commit Graph

36294 Commits

Author SHA1 Message Date
AnturK dc4ed47936 Fixes double roundend time. (#27840) 2017-05-29 10:14:39 -04:00
Leo 4ffcb04ce2 Merge pull request #27782 from Jordie0608/weshouldprobablyreportthistolummoxbuttheressolittleinformationtoworkon
Adds coalesce to world.internet_address
2017-05-29 11:14:33 -03:00
AnturK 97850a89f4 Speeds up apc visual updates (#27797) 2017-05-29 11:13:28 -03:00
Joan Lung 90335b64bb Merge pull request #27796 from bgobandit/whosagoodianyesyouareianyapyapyap
You can pet dogs again.
2017-05-29 09:58:32 -04:00
Leo c4c3c77aba Merge pull request #27770 from optimumtact/holocallsmorelikeholocaust
AI holocall hangups
2017-05-29 08:37:29 -03:00
Leo 6d68f6bc79 Merge pull request #27768 from AnturK/coil
Cable coils New -> Initialize
2017-05-29 08:33:59 -03:00
Leo 7ddb54f439 Merge pull request #27774 from ChangelingRain/mesontextfix
Fixes mesons giving the wrong message when toggling off
2017-05-29 08:31:42 -03: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
kevinz000 6cfbab9e2e Update gun.dm (#27776) 2017-05-29 02:15:47 -04:00
Iamgoofball 0d7ae31f0e jeez steelpoint I know your snowflake role is important but >20 cost (#27819) 2017-05-28 18:57:39 -04:00
Steelpoint ac8dddb00f [Centcom] Nanotrasen Private Security 2.0 (#27652)
This PR adds a lot of changes so I'll list them one by one, this is a continuation of my original NPS PR, however with criticism taken on: #24161

Centcom Nanotrasen Security. The centcom docks now have two NT private security officers, though they don't seem very lifelike (AKA: Cardboard cutout).

New NT Private Sec cardboard cutout, can be acquired in game as you do with every other cardboard cutout.

New passive, retaliate, NT Private Security NPCs. These NPCs are akin to their aggressive versions, however these officers will only attack someone who attacks them first. If attacked they will call for backup and engage the perpetrator with extreme prejudice.

They are also apart of the 'nanotrasanprivate' faction, meaning they will not attack each other, their aggressive counterparts or player controlled Human Private Sec.

Currently none spawn on any map.

New cyropod Private Security Officer pods. These function akin to lavaland roles in that you click the sleeper and you become that role. The Cyro PSO is currently admin only, but spawns as apart of the same faction as the NPCs. They have all access to centcom
2017-05-29 09:38:26 +12:00
oranges 606b030226 Add AI disconnect
The AI can now hangup holocalls
2017-05-28 21:09:54 +00:00
AnturK 0a2d1f1bf3 coil to initialize 2017-05-28 23:09:53 +02:00
swindly 5fb79e7d92 Fixes attaching heads without brainmobs (#27765) 2017-05-28 18:07:38 -03:00
Jordan Brown 532578b196 Reboot initiated by an admin will never be delayed (#27763) 2017-05-28 18:07:05 -03:00
Jordan Brown 2dc58b605e Fixes Centcom not being selflooping 2017-05-28 15:42:39 -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
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
AnturK 26be9d20e7 Fixes captain's spare access. (#27788) 2017-05-28 10:10:40 -04:00
Leo 8763506e8e Merge pull request #27723 from QualityVan/clonerempty
Emagging a cloner drops bits, cloners don't keep extra flesh
2017-05-28 10:43:25 -03:00
Leo 460146d4ac Merge pull request #27748 from kevinz000/patch-187
Fixes projectile dampening fields being on infinite cooldown
2017-05-28 10:42:22 -03: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
ShizCalev 6b54a7e604 Clean snow, lavaland, and thunderdome (#27742)
* fixes

fixes #27644

* lavaland

Fixes #27590
2017-05-28 15:23:16 +02:00
Joan Lung 9275ec2327 Merge pull request #27750 from kevinz000/patch-189
Fixes clown creampie cannon not recharging properly
2017-05-28 09:17:08 -04:00
Joan Lung 0e0b4d92cb Merge pull request #27739 from ShizCalev/gang-memes
Removes duplicate sharpener from gang uplink
2017-05-28 09:16:08 -04:00
Joan Lung 68879e7b28 Merge pull request #27737 from ShizCalev/power-outage
Fixes poweroutage event blowing up SM
2017-05-28 09:15:47 -04:00
Joan Lung d1009b7739 Merge pull request #27736 from ShizCalev/lavaland-fixes
Lavaland Lighting Fix + ruin varedit cleanup
2017-05-28 09:14:59 -04: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 26dbc0024d Merge pull request #27749 from kevinz000/patch-188
makes machineguns pass their users to their fire helpers instead of the floor
2017-05-28 09:13:15 -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
Profakos 125204d2ae Fixes meteors 2017-05-28 11:20:18 +02:00
Jordie0608 0f914e4233 adds coalesce to world.internet_address 2017-05-28 15:46:35 +10:00
oranges 2d56ca437b Merge pull request #27778 from KorPhaeron/fixes
Comm Console Fix
2017-05-28 16:26:22 +12:00
KorPhaeron c04e555408 Comm Console Fix 2017-05-28 00:21:10 -04: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
oranges 0fa2680376 Merge pull request #27730 from lzimann/thenthan
Fixes typo in garbage subsystem
2017-05-28 13:55:45 +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
Jordan Brown 511037476a Fixes revision stat tracking (#27712) 2017-05-27 22:46:03 -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