Commit Graph

6054 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
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
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
4DPlanner
445ac6383d lol 2017-05-25 14:09:09 +01: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
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
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
kevinz000
9c37fa99f1 Update jetpack.dm (#27488) 2017-05-21 16:31:54 -04:00
Joan Lung
de45c268ed Merge pull request #27283 from Robustin/gangclothes
Decentralized and Vastly Improved Gang Influence System
2017-05-20 19:36:51 -04:00
KorPhaeron
3dc8ba98f0 Adds webbing 2017-05-20 08:33:47 -04:00
swindly
8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Mike Long
fdc79301d6 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace (#27371)
* Adds a new toy to arcade prizes.  A rumbling toy toolbox meant to mimic hisgrace.

* Adds attack verb and fixes formatting on a list.
2017-05-18 10:56:28 -06:00
Tacolizard
264e8b8625 Plasmaman Plasma Tanks are just as large as normal emergency tanks (#27372)
* extreme power creep please ban me

* Update tank_types.dm
2017-05-18 10:55:34 -06:00
kevinz000
16b44c2937 [READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234)
* fields

* peaceborg dampeners

* hm

* nerfs recharge

* ...

* fffff

* objectively fields

* kinda_working

* why is this not working

* cheep

* bugfixes, adds to robot

* cross doesn't work ;-;

* on border

* appearance

* hi, is this a refactor?

* ffs

* ree

* monitor

* monitor

* hm

* all good

* Update robot_items.dm
2017-05-18 10:53:55 -06:00
kevinz000
6c0f3433a3 Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC (#27241)
* Update pneumaticCannon.dm

* Update uplink_item.dm
2017-05-18 10:27:51 -06:00
coiax
9fabe5b0b5 Vending machines are more dangerous when throwing items (#27361)
* Vending machines are more dangerous when throwing items

🆑 coiax
add: Various vending machines, when shooting their inventory at nearby
people, will "demonstrate their products features". This means that if a
cigarette vending machine throws a lighter at you, it will be on.
Vending machines also choose random products when throwing, rather than
the first availible one.
/🆑

- Lighters are now flame coloured, and have been minorly refactored
- Secvendors prime flashbangs, and turn on their flashights when
throwing them at people.
- Cigarette vendors light their lighters
- The selection process shuffles the item list before iterating, so it
won't just throw the first thing

* Preprime grenade and set on fire with throwing

* Actually prime grenades when people use them
2017-05-18 10:11:55 -06:00
Leo
a66febe2b5 Merge pull request #27359 from coiax/no-emp-c4
Plastic explosives can no longer be detonated by EMPs
2017-05-18 12:41:28 -03:00
Joan Lung
1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
QualityVan
c80f8af206 Prepends object names with 'The' in speech 2017-05-17 05:48:41 -04:00
Jack Edge
f8f95ca655 Plastic explosives can no longer be detonated by EMPs
🆑 coiax
balance: Plastic explosives can no longer be detonated by EMPs.
/🆑

> OOC: TheWulfe: Why does an Ion Rifle INSTANTLY kill anyone who
> carries the most common and basic item, the C4?
2017-05-17 10:14:49 +01:00
Militaires
36fa247081 fixes triple latched toolboxes being spawning too often than anticipated (#27285) 2017-05-17 02:01:30 -05:00
Leo
bf4903cc13 Merge pull request #27301 from coiax/tiny-ball
Eightballs are tiny items
2017-05-16 20:10:32 -03:00
Expletive
810bb90b28 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#27192)
Syndicate Tomes have been added to traitor uplinks for 9 TC. They let an agent or an operative provide both weal and woe.
2017-05-16 16:54:00 -03:00