Commit Graph

3951 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 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
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
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
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
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
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 9c37fa99f1 Update jetpack.dm (#27488) 2017-05-21 16:31:54 -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
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 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
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
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
kevinz000 9bbd77d452 Update pneumaticCannon.dm 2017-05-13 17:51:32 -07:00
Leo 62656ab219 Revert "Ports dakimakuras from HippieStation." (#27231)
* Revert "Automatic changelog generation for PR #27167 [ci skip]"

This reverts commit 233d71fd18.

* Revert "Ports dakimakuras from HippieStation. (#27167)"

This reverts commit d348072ca2.
2017-05-14 09:38:42 +12:00
Sarcalogo d348072ca2 Ports dakimakuras from HippieStation. (#27167)
* Ports dakimakuras from HippieStation.

Dakimakuras are life sized body pillows with the image of anime
characters on them. This was originally an 8ch creation, but was ported
to Hippie. I'm now porting it here.

Although I am permabanned from /tg/, I know that /tg/ has the most
talented, creative, and active coders of all code bases. If I add
Dakimakura's here, then you guys will undoubtedly add new content to it.
I will then be able to enjoy that new content on other servers that
mirror your pull requests. Makes sense yes?

* Removes Hotwheels from list of selectable dakis.

Hotwheels was the host of 8ch and I removed the image from the DMI. This
would cause a runtime error if not removed.

* Fixes what AnturK told me to.

* Uses to_chat.

* Most of those changes done.

* Apply's PR fixes
2017-05-14 09:34:08 +12:00
kevinz000 7fda11e7b4 Gives the clown a pie cannon, also improves pneumatic cannons (#27114) 2017-05-13 12:01:39 -03:00
Cyberboss ac11813bad Cleans up some Initializes (#27174) 2017-05-13 07:35:18 -06:00
Joan Lung 57830b1a4f You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#27088) 2017-05-10 09:21:35 -03:00
Mike Long 4687dd0117 Devil refactor+small revamp (#26815)
Hello, with PR #26717 merged, I think it's a good time to add devils to the standardized antag datum system.

This PR is mostly a refactor, which shouldn't be noticed by the playerbase. Changes that might be noticed are below.

🆑
tweak: Modified chances for returning someone's soul using an employment contract. Now everyone has a chance, not just lawyers and HoP.
add: Particularly brain damaged people can no longer sign infernal contracts properly.
tweak: Infernal contracts for power no longer give fireball, and instead give robeless 'lightning bolt' spell.
add: Devils can now sell you a friend, for the cost of your soul.
tweak: The codex gigas should now be easier to use, and less finicky.
del: The codex gigas no longer sintouches readers.
/🆑
2017-05-10 22:02:17 +12:00
oranges e8c1c60942 Merge pull request #26980 from AnturK/click-fixes
Small Click refactor.
2017-05-08 20:05:39 +12:00
Leo ad4f15d501 Merge pull request #26938 from Cyberboss/patch-76
Fixes his grace CtrlClick
2017-05-07 13:33:46 -03:00
Robustin ec140736da C4 planting takes 3 seconds, down from 5 (#26941)
* 2 seconds of c4 planting

* Why the fuck do we have 2 C4 weapons

* Update explosives.dm
2017-05-07 09:31:34 -05:00
Joan Lung 74f00e629f Cult fixes (#26990)
* Cult fixes

* ha ha whoops

* whoooops

* whoops x3 combo
2017-05-07 00:51:40 -03:00
Leo 41067e00f5 Merge pull request #26933 from QualityVan/vendingbuilds
Makes medbay vending machines buildable
2017-05-06 15:51:24 -03:00
AnturK 8f40e14a79 Small Click refactor. 2017-05-06 14:10:11 +02:00
Cyberboss 74c0756e28 Repaths C4 2017-05-05 13:23:45 -04:00
Cyberboss 4141adf931 Update his_grace.dm 2017-05-05 09:00:20 -04:00