Commit Graph

6020 Commits

Author SHA1 Message Date
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
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
Joan Lung
2b436e4b6b Merge pull request #27271 from coiax/cult-supply-talismans
Refactors supply talismans to be less shitcode
2017-05-15 18:53:29 -04:00
Cyberboss
512a1cda92 Ports radios to Initialize (#27262) 2017-05-15 13:06:31 -03:00
Jack Edge
f84d80aa42 Eightballs are tiny items
🆑 coiax
balance: Magic eightballs are now tiny items, able to fit into a box and
pocket.
/🆑

Was an oversight when I added them originally, they're about tiny sized
anyway.
2017-05-15 15:32:15 +01:00
Expletive
6f88d224ec Adds a few new recipes created with plastic sheets (#27257) 2017-05-15 09:02:24 -03:00
Jack Edge
fea3dd0ffe Refactors supply talismans to be less shitcode
- A used supply talisman makes a pile of ash when it's used up
- Weak supply talismans no longer have a "runed metal" option that
doesn't work.
- The generation of the talisman menu is now dynamic.
2017-05-14 20:18:44 +01: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
oranges
c7702d2548 Merge pull request #27154 from KorPhaeron/shia
Land Claim Flag
2017-05-14 00:20:43 +12:00
swindly
86a6c47371 Buffs plasma and nerfs snow (#27147) 2017-05-12 17:13:40 -03:00
Robustin
1a76285d1c Decentralization and Gang Clothes 2017-05-12 00:54:09 -04:00
KorPhaeron
5954fe7211 Land Claim Flag 2017-05-11 17:47:00 -04:00
Joan Lung
3711b58f36 Harvesters are more fun to play (#27086) 2017-05-10 12:18:15 -03: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
4f16455dc5 Merge pull request #27059 from QualityVan/machinenames
Capitalizes machine names when they talk on radio
2017-05-10 22:00:57 +12:00
coiax
15cd682eef Makes it clear whether (in)complete golem shells are free or servant (#27025)
* Artifical golem shells now have "artificial" in the name

So it's clear whether you're becoming a free or an enslaved golem.
2017-05-08 15:56:47 -03:00
oranges
e8c1c60942 Merge pull request #26980 from AnturK/click-fixes
Small Click refactor.
2017-05-08 20:05:39 +12:00
oranges
7436d7d990 Merge pull request #26854 from FantasticFwoosh/LeatherClub
Refactors leather with crafting, removed bio-generator designs + adds craftable muzzles
2017-05-08 20:04:23 +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
Leo
30eb129000 Merge pull request #26943 from Cyberboss/c4Remove
Repaths C4
2017-05-06 15:48:35 -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
Jack Edge
0c72dc1ab9 Make adamantine with adamantine slime cores 2017-05-05 18:08:40 +01:00
Cyberboss
4141adf931 Update his_grace.dm 2017-05-05 09:00:20 -04:00
QualityVan
76fc44167a Makes medbay vending machines buildable 2017-05-05 02:11:21 -04:00
PKPenguin321
c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
Leo
8a0196c8ed Merge pull request #26873 from BeeSting12/spawnernades
Fixes grammar error on spawner grenades
2017-05-04 22:25:17 -03:00
Mike Long
37be45d211 Adds spewium toxin in traitor kits (#26848) 2017-05-04 19:53:06 -03:00