Commit Graph

9644 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Expletive
b13ac48065 Vapes are tiny (#27689) 2017-05-27 11:48:20 -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
kevinz000
feb4bd1c45 Update pneumaticCannon.dm 2017-05-27 01:21:33 -07:00
kevinz000
1a26edd243 Update robot_items.dm 2017-05-27 00:37:23 -07: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
Leo
ab1999e026 Merge pull request #27681 from Cyberboss/GunInit
Ports guns to Initialize
2017-05-26 21:05:55 -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
f6c3516b98 Merge pull request #27679 from Cyberboss/patch-100
Ports defibs to Initialize
2017-05-26 20:01:46 -03:00
Joan Lung
5387d795a8 Splits up mine_items.dmi (#27669) 2017-05-26 15:19:16 -03:00
cacogen
1a1682bc44 Adds AI follow links to PDA messages and holopad speech 2017-05-27 04:44:29 +12:00
kevinz000
882cd4ac46 Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging (#27655) 2017-05-26 13:12:41 -03:00
kevinz000
d536bf6caf [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#27416)
* hm

* separation part 1

* fixes and more fixes

* gunlight minirefactor

* refactor

* done
2017-05-26 10:37:10 +02:00
ClosingBracket
872724de98 Update belt.dm 2017-05-25 20:08:09 -05:00
Cyberboss
7a4f640eec Ports guns to Initialize 2017-05-25 19:51:08 -04:00
Jordan Brown
6807b62aa3 Ports stunbatons to Initialize 2017-05-25 19:29:13 -04:00
Jordan Brown
f47760a86c Ports defibs to Initialize 2017-05-25 19:15:30 -04:00
Joan Lung
9724a8f35a Merge pull request #27656 from 4dplanner/c4
c4 now takes 3 seconds instead of 5 to plant
2017-05-25 12:20:48 -04:00
Leo
04cb10b31c Merge pull request #27624 from Cyberboss/patch-95
INDESTRUCTIBLE objects are no longer affected by explosions
2017-05-25 10:37:05 -03:00
4DPlanner
445ac6383d lol 2017-05-25 14:09:09 +01:00
Jordan Brown
7b3bc38351 Refactors explosions (#26361) 2017-05-24 18:44:08 -03:00
Leo
a11e11ecee Merge pull request #27580 from ChangelingRain/splitequipment
Splits equipment.dm into several component files
2017-05-24 10:27:29 -03:00
Cyberboss
2d120fe7e2 INDESTRUCTIBLE objects are no longer affected by explosions 2017-05-24 08:47:09 -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
a2c0e7e592 Water wets hide, you can microwave wet leather (#27546)
* Water wets hide, you can microwave wet leather

* microwave output
2017-05-23 23:18:20 -06:00
Food
b992136191 Resolve conflicts, change name. 2017-05-23 15:43:35 -04:00
Joan Lung
181eb89a19 Splits equipment.dm into several component files 2017-05-23 09:50:41 -04:00
Cruix
e95a2ac36b Replaced mob spawner vars with outfits (#27534) 2017-05-23 09:57:17 -03:00
Leo
6bb099a411 Merge pull request #27521 from Cyberboss/patch-90
Removes HasProx testing message
2017-05-23 00:47:15 -03:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
Leo
855224ec28 Merge pull request #27532 from optimumtact/dnainjectors
DNA injector inject proc now properly returns success
2017-05-23 00:43:47 -03:00
oranges
ea69e7a473 Merge pull request #27458 from KorPhaeron/webbing
Adds webbing
2017-05-23 15:19:59 +12:00
Robustin
5ceb2faaea CultEffect 2017-05-22 11:37:51 -04:00
kevinz000
40a5b1faac fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result. (#27497) 2017-05-22 09:26:43 -03: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
oranges
cab9c9a963 DNA injector inject proc now properly returns success 2017-05-22 02:39:31 +00:00
kevinz000
b5b2543fdf Fixes pkborg fields not updating location or draining power (#27430) 2017-05-21 20:28:53 -03:00
Cyberboss
f87dd5e52f Removes HasProx testing message 2017-05-21 18:33:55 -04:00
kevinz000
9c37fa99f1 Update jetpack.dm (#27488) 2017-05-21 16:31:54 -04:00