Commit Graph

9675 Commits

Author SHA1 Message Date
AnturK
74febcf7bc Fixes bsa not showing up (#28032) 2017-06-04 09:42:50 -03:00
oranges
ca6f4cfc35 refactor another spawn cooldown (#28022) 2017-06-04 12:29:41 +02:00
oranges
9e28fd8ae7 Another spawn timer (#28018) 2017-06-04 12:23:10 +02:00
Leo
477bd09609 Merge pull request #27948 from swindly/grenade_buff
Buffs chemical grenades
2017-06-03 23:38:51 -03:00
Cheridan
aad23d5304 Merge pull request #27964 from Expletive/variablestacksize
[READY] Stacks will change item_states and w_class based on how full they are.
2017-06-03 19:02:57 -05:00
Jordan Brown
0d753d862b Add the ability for all objects to use explosion_block (#27971) 2017-06-03 17:41:51 -05:00
Expletive
73d65ceb82 The Crafting Menu now has subcategories! (#27863)
* subcategories also it's broken

* It works!

* Fix pneumatic cannon recipe

* Some fixes and changes

* Reformats ui, removes redundant chat messages

* Remove comment

* while im at it
2017-06-03 19:28:14 +02:00
Nick
fd3691aa8e Gives the janitor a flyswatter in their roundstart equipment (#27959) 2017-06-03 04:24:45 -03:00
Expletive
3f62253b3b Adds sprites for certain lavaland stacks and adjusts their max_amounts 2017-06-02 07:39:08 -07:00
oranges
0979a24e07 Merge pull request #27932 from octareenroon91/patch-48
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
2017-06-02 23:41:28 +12:00
Expletive
cc8fea0905 remove-true 2017-06-02 03:15:17 -07:00
Expletive
b928177ea5 Stacks will change sprites and w_class based on how full they are. 2017-06-02 02:55:41 -07:00
Leo
c84b6f2a9b Merge pull request #27922 from QualityVan/tacticoolwebbing
Makes op belts less brown
2017-06-01 22:31:24 -03:00
Steelpoint
901d762d1e Marine ID Access Change (#27907) 2017-06-01 17:29:13 -03:00
swindly
c8b8eec88b buffs chem grenades 2017-06-01 15:28:21 -04:00
Goodstuff
c8717940a2 Fixes black carpet recipe and sprite (#27891) 2017-06-01 10:38:24 -03:00
octareenroon91
4012ce0aa7 Update storage.dm 2017-06-01 00:24:26 -05:00
QualityVan
aff5e45e55 Makes op belts less brown 2017-05-31 20:40:15 -04:00
oranges
4493895336 Merge pull request #27879 from Cyberboss/CultFix
Fixes posters
2017-06-01 12:28:46 +12:00
kevinz000
4f7970b3b9 Gang Machinegun Mouse Tracking + Projectile Source Fix (#27868)
Moves Gang Machineguns to its own file. It's not a goddamn portable turret and it's not even something that uses power!

Gang Machineguns now track the mouse location of the first buckled person (For those who don't code, that means the person using it)

Gang Machineguns will automatically aim and turn towards whatever that person is pointing at.. 
However, to make it target something specifically instead of a direction, you still have to hold your mouse down while firing.

Gang machineguns will no longer cause the user to shit out bullets if they unbuckle during firing :^)

SOME REFACTORS TO PIXEL PROJECTILES ARE INCLUDED...
2017-06-01 12:10:47 +12:00
Expletive
2b298bb6aa Adds The NT-75 Electromagnetic Power Inducer (#27653) 2017-05-31 14:59:13 -03:00
Leo
69f6cc7f96 Merge pull request #27866 from AnturK/something-i-remembered
Makes VV'ing ID cards easier.
2017-05-31 10:48:43 -03:00
Joan Lung
5ef4f1581a Merge pull request #27881 from Expletive/luxurycapsule
Luxury Bluespace Shelter Capsules, Take 2.
2017-05-30 18:05:31 -04:00
Expletive
80ce91306f Some things I missed. 2017-05-30 14:31:55 -07:00
Expletive
9466b6f62c Maybe this time I won't fuck it all up 2017-05-30 14:10:54 -07:00
Cyberboss
11c6635e1b Fixes posters 2017-05-30 16:20:53 -04:00
AnturK
79af94382a Flamethrower fixes (#27846) 2017-05-30 13:54:56 -06:00
AnturK
ae710055cc Makes VV'ing ID cards easier. 2017-05-30 13:21:34 +02:00
Leo
23d2e3732e Fixes pAI letting you return to lobby (#27812) 2017-05-29 21:42:38 +02:00
Tacolizard
334997133d Update tank_types.dm (#27769) 2017-05-29 10:07:08 -06:00
AnturK
19192fd4ca Removes dragoontomb ruin and loot. (#27799) 2017-05-29 10:04:29 -06: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
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