Commit Graph

19407 Commits

Author SHA1 Message Date
Leo c4c3c77aba Merge pull request #27770 from optimumtact/holocallsmorelikeholocaust
AI holocall hangups
2017-05-29 08:37:29 -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
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
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
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
Profakos 125204d2ae Fixes meteors 2017-05-28 11:20:18 +02:00
KorPhaeron c04e555408 Comm Console Fix 2017-05-28 00:21:10 -04:00
oranges 12f6ef45ff Merge pull request #27697 from KorPhaeron/z2
Centcomm is on Z1
2017-05-28 13:57:00 +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
Jordan Brown 511037476a Fixes revision stat tracking (#27712) 2017-05-27 22:46:03 -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
ShizCalev 820a05aff1 missing bracket (#27762) 2017-05-27 15:08:51 -04:00
Expletive b13ac48065 Vapes are tiny (#27689) 2017-05-27 11:48:20 -04:00
Jordan Brown 14fd7e98c8 Ports clonepods to Initialize (#27716) 2017-05-27 11:46:48 -04:00
Joan Lung 603d44840c Merge pull request #27701 from tgstation/lzimann-patch-1
Fixes dirty in lavaland
2017-05-27 11:26:11 -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
Expletive 185235dc15 Port vapes to Initialize() (#27688) 2017-05-27 10:21:10 -03:00
AnturK cf5618e31e ID card mapping aid (#27690) 2017-05-27 10:20:20 -03:00
Leo f8036d83e6 Merge pull request #27692 from kevinz000/patch-185
Make dance machine mob dancing asynchronous
2017-05-27 10:19:28 -03:00
kevinz000 feb4bd1c45 Update pneumaticCannon.dm 2017-05-27 01:21:33 -07:00
kevinz000 4ca690a297 Update portable_turret.dm 2017-05-27 00:47:13 -07:00
kevinz000 1a26edd243 Update robot_items.dm 2017-05-27 00:37:23 -07: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
shizcalev d06425a25b fixed dupe
fixes #27602
2017-05-27 01:16:26 -04:00
Leo 08777c4958 Merge pull request #27684 from ClosingBracket/change-explorer-webbing
Allows explorer webbings to hold marker beacons
2017-05-27 01:53:22 -03:00
shizcalev 33a83408eb straight outta powah
fixes #27732
2017-05-27 00:46:46 -04:00
shizcalev 0bf0b012ae lavaland fixes
closes #19508
fixes #24777
2017-05-27 00:17:16 -04: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 6105e865e2 Merge pull request #27680 from Cyberboss/patch-101
Ports stunbatons to Initialize
2017-05-26 20:02:35 -03:00
Leo 6fef1d51a3 Merge pull request #27678 from Cyberboss/patch-99
Makes a thing use QDEL_NULL
2017-05-26 20:02:26 -03:00
Leo f6c3516b98 Merge pull request #27679 from Cyberboss/patch-100
Ports defibs to Initialize
2017-05-26 20:01:46 -03:00
QualityVan 1133b103ea Prevents cloning pods from keeping leftover parts 2017-05-26 17:37:58 -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
Leo eea0dc085a Merge pull request #27661 from Cyberboss/patch-91
Fixes ex_act not having waitfor = FALSE
2017-05-26 15:21:24 -03:00
Leo d9550db98f Merge pull request #27667 from Cyberboss/patch-97
Fixes airlocks having two Initializes
2017-05-26 15:20:14 -03:00
Leo 96693de99a Merge pull request #27668 from Cyberboss/patch-98
Makes a thing use QDEL_NULL
2017-05-26 15:19:47 -03:00
Joan Lung 5387d795a8 Splits up mine_items.dmi (#27669) 2017-05-26 15:19:16 -03:00