Commit Graph

139 Commits

Author SHA1 Message Date
TrustyGun
f64d878bb2 Advanced Mimery tweak (#24966)
* tweaks mime kit

* okay mister blue saturn man
2017-03-14 16:20:50 -04:00
AnturK
c65da5a494 Adds radio jammer (#24667)
* Adds radio jammer

* Garbling stands out less now
2017-03-11 17:05:44 +13:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
coiax
2d288690e1 New Librarian traitor item: Haunted Magic Eightball (#24607)
* New Chaplain traitor item: Haunted Magic Eightball

🆑 coiax
add: Toy magic eightballs can now be found around the station in
maintenance and arcade machines. Ask your question aloud, and then
shake for guidance.
add: Adds new Chaplain traitor item, the Haunted Magic Eightball.
Although identical in appearence to the harmless toys, this occult
device reaches into the spirit world to find its answers. Be warned,
that spirits are often capricious or just little assholes.
/🆑

* Compiles, fixes the bugs

* Adds toy eightballs to loot, toys; adds haunted to uplink

* Every 3 minutes

* Noiseless, random haunt, limited stock

* Added sprites for eightball

* Removed notice to replace sprites

* Librarian only
2017-03-08 12:14:44 +13:00
PKPenguin321
463b9cd147 Mimery Kit Adjustments (#24575)
* Mimery Kit Adjustments

This commit lowers the cost to 12 TCs

* Grammar changes

Makes some messages more grammatically correct and better sounding yeah

* Fixes shooting mime bullets while restrained/incapacitated
2017-03-02 20:10:46 +13:00
anconfuzedrock
f8a311b51b Adds glorf jumpsuits as an assistant exclusive 20tc traitor item (#24285)
* adds glorf jumpsuits as 20tc assistant exclusive

* alright this time not on my master

* this time it exists and its not on my master

* fixes capitilization in the fucking word "Yeah"

* I liked the uh but it was kinda weird in that sentence I guess

* Is this better

* I didn't know I had to specifically put surplus = 0 my bad

* glorf
2017-02-25 12:51:29 -06:00
oranges
8515144026 Merge pull request #24192 from coiax/syndiborgs4all
Syndiborg costs reduced and split
2017-02-20 10:09:07 +13:00
TrustyGun
38419057b7 Advanced Mimery Kit (#23978)
d

🆑
add: Traitor mimes can now learn two new spells for 15 tc.
add: The first, Invisible Blockade, creates a 3x1 invisible wall.
add: The second, Finger Guns, allows them to shoot bullets out of their fingers.
/🆑

Traitor mimes can buy the Guide to Advanced Mimery for 15 tc. Invisible Blockade creates a 3x3 invisible wall around the mime, and Finger Guns allows Mimes to shoot bullets out of their fingers.

Invisible Blockade is 3x1 now to avoid this problem and still make Mimes be blocked by their own walls.
2017-02-19 00:49:40 +13:00
Jack Edge
40d010e976 Syndiborg costs reduced and split
🆑 coiax
add: Nuke ops syndicate cyborgs have been split into two seperate uplink
items. Medical cyborgs now cost 35 TC, assault cyborgs now cost 65 TC.
/🆑

- Reasons for the reduction in price: syndiborgs are too fragile for
their high cost, and although they have a lot of offensive potential, a
flashbang, a flash, a laser pointer, and that's a huge investment gone.

- Splitting them is because no one picks medical syndiborg, and it's
strong, but not as strong as an assault borg.
2017-02-17 18:28:56 +00:00
Joan Lung
db94a3d83b His Grace is a better item and less globally-announced (#23951)
* His Grace is a better item and less globally-announced

* grace

* graceful

* tiny eyes!

* tiny eeeeyes

* less lethal

* You must have His Grace.

* You just need to compile His Grace.

* highly lethal grace

* ding ding ding you're super fucked

* rrr

* His Grace
2017-02-16 15:18:45 +01:00
AnturK
54c51a5510 Poison Pen (#23778)
* Poison Pen

* Fixup

* Logs

* Fix & proper name
2017-02-12 14:17:47 +13:00
Cheridan
530d4aa887 Merge pull request #23883 from coiax/hug-box
Reverse revolver now comes in a box of hugs
2017-02-10 02:14:45 -06:00
Xhuis
ecf5cc62af Hotfixes the reverse revolver appearing in surplus crates (#23872)
* Hotfixes the reverse revolver appearing in surplus crates

* that was the real prank
2017-02-09 16:07:03 -06:00
Jack Edge
622eafe8ef Reverse revolver now comes in a box of hugs
🆑 coiax
add: A reverse revolver now comes in a box of hugs.
/🆑

- You can now tell if the revolver you got in your surplus crate is a
REAL revolver, or a reverse one. Also, free hugbox.

Closes #23872.
2017-02-09 04:04:29 +00:00
Xhuis
21996756be Adds the artistic toolbox and His Grace (#23699)
* Adds His Grace

* Resets victims and warnings on sleep

* Now with compiling!

* Adds the artistic toolbox and maintenance loot
2017-02-08 18:22:00 +13:00
Xhuis
c038691d10 Adds the reverse revolver for traitor clowns (#23763)
* Adds the reverse revolver for traitor clownes

* [user.p_them()]self

* ()
2017-02-07 16:26:04 -06:00
Leo
dba633c218 Romerol no longer have a chance of discount (#23801) 2017-02-07 16:24:38 -06:00
Joan Lung
d1c035aa19 Merge pull request #23701 from Xhuis/ez_clean
Adds EZ-clean grenades to the uplink
2017-02-05 20:33:11 -05:00
Joan Lung
246b1fd253 Merge pull request #23671 from KorPhaeron/eyes_as_organs
Eyes As Organs
2017-02-04 17:14:19 -05:00
Xhuis
0d68a8f770 Adds EZ-clean grenades to the uplink 2017-02-04 15:59:36 -05:00
Xhuis
42d4811398 Framework for dynamic role-specific uplink items (#23227)
* Role-specific traitor items

* Restricts role-specific items from nuke ops

* Changes default config

* Removes config option
2017-02-04 16:32:21 +13:00
KorPhaeron
6ad9b5abe1 Replaces cybernetic implants with cybernetic eyes 2017-02-03 18:47:49 -06:00
Kyle Spier-Swenson
b5a3ba9133 Shitty ideas thread: 1. Traitor Uplink spawn location is now a Pref! Choose between PDA, Radio and all new: Pen! (#23190)
* 1. Traitor Uplink spawn location is now a Pref! Choose between PDA, Radio and all new: Pen!

* reeeee
2017-01-31 21:52:07 +13:00
oranges
3f7b94e923 Merge pull request #23275 from coiax/empty-uplink-implant
Uplink implants are now empty by default
2017-01-31 09:23:35 +13:00
oranges
cd59dda97a Merge pull request #23402 from PKPenguin321/patch-9
tweaks no-slip shoe buying
2017-01-30 10:27:33 +13:00
coiax
7e4a0ee0df Adds Romerol (the REAL zombie powder) to uplink (#23369)
* Adds Romerol (the REAL zombie powder) to uplink

🆑 coiax
add: Syndicate agents have gained access to a highly dangerous
experimental bioterror agent, that causes partial reanimation and
aggression after death.
del: Zombie infections are no longer visible on MediHUD.
/🆑

- Adds a reagent to the uplink that gives anyone who injests it a
dormant zombie organ that will reanimate them as a zombie after they
die.
- Initial price estimate is 20TC because this is some fungal TB level
!fun!.
- Good for traitor chefs.
- Zombies are fun, let's have more of them.

* Fixes runtimes, removes airlock tearing

* aGGression

* Update health?

* Zombies are not TOXINLOVERS that's dumb

* Removes from uplink

* Revert "Removes from uplink"

This reverts commit a0acd313929b0787c2eab0d7f289e305212fa0ed.

* 25 TC
2017-01-29 11:21:37 -06:00
PKPenguin321
8be6d781c8 tweaks no-slip shoe buying 2017-01-27 19:48:08 -08:00
coiax
adfd8b0b3c Nuke ops cybernetics changes (#22817)
* Nuke ops cybernetics changes

Fixes #22814.

🆑
del: Nuclear operatives no longer get free autoimplanters when
they purchase cybernetic implants, except in the cybernetic implant
bundle.
fix: The cybernetic implant bundle now actually contains implants.
/🆑

* Changes descriptions rather than behaviour

* No discounts for discounts
2017-01-26 08:15:05 -06:00
coiax
338e67808e You can now buy telecrystals in stacks of 5 and 20 (#22818)
🆑 coiax
add: Telecrystals can be purchased in stacks of five and twenty.
add: The entire stack of telecrystals are added to the uplink when
charging them.
/🆑
2017-01-26 13:37:22 +01:00
Jack Edge
5cf651822b Uplink implants are now empty by default
🆑 coiax
del: The Syndicate "Uplink Implant" now has no TC precharged. You can
charge it with the use of physical telecrystals. The price has been
reduced from 14TC to 4TC accordingly. (The uplink implant in the implant
bundle still has 10TC).
/🆑

- Also cleaned up implantuplink.dm.
- Removed "weak" uplink implants, which were only used for persistence
memes.

These changes will make purchasing an uplink implant more common, as you
don't have to commit a large chunk of TC to use it. It's a buff to a
rarely used syndicate item, and synergises with physical telecrystals.
2017-01-23 15:43:18 +00:00
AnturK
ec99f7e841 Fixes nuclear uplinks outside nuke gamemode 2017-01-23 10:06:48 +01:00
Mervill
272c6270e0 Clean Code (2008) 2017-01-15 18:02:11 -08:00
Mervill
5b2b4cbb20 WOOPS I MEAN THIS ITEM TYPE 2017-01-15 09:26:47 -08:00
Mervill
96c241b782 don't add raw telecrystals to the uplink purchase log 2017-01-15 09:23:36 -08:00
Incoming5643
873799f655 Revenge of Uplink Discount System (#22429)
* Traitor discounted item system! Every uplink will have three random items on sale for between 25% and 75% off (strongly weighted towards smaller deals). All these items are single purchase only.

* Whoops, accidentally used a feature not in the travis build of dream maker.

* Featuring Remie from code optimization
2016-12-28 09:06:27 +13:00
Incoming5643
122c4f1b3e The fake disk will almost never appear in surplus crates 2016-12-12 13:03:36 -05:00
Incoming5643
7834776300 Allows traitors/operatives to buy cheapo fake nuke disks 2016-12-11 21:17:18 -05:00
PKPenguin321
14f272c082 reduces cost of throwing weapons box (#21649) 2016-11-20 20:41:32 -06:00
oranges
fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Supermichael777
5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
kevinz000
7e364fd79a rip 2016-10-29 20:45:23 -07:00
kevinz000
bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
uraniummeltdown
1635017bb2 Atmos Grenades (#21014)
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
2016-10-24 00:15:51 +13:00
Militaires
2431e709b8 CQC PR AGAIN and does what orangus wanted. (#20932)
A third martial art, CQC, has been added and is now available to nuke ops instead of sleeping carp

added leg sweeps by resting and then harming someone, so that you can flank someone by pretending to be crit or ded henk, not putting it in the recall teachings cause im a memer like that

new: CUSTOM CQC SOUNDS
2016-10-18 09:11:02 +13:00
Incoming
2617dabb99 Intensifies the secret satchel system so people will actually use it. 2016-09-25 21:28:56 -04:00
Shadowlight213
5d98fb64d9 changes to instead use the argument in get_uplink_items 2016-09-07 21:49:54 -07:00
Shadowlight213
cacc091ed3 Makes the surplus crate only give items in the current mode's uplink list
Removes sleeping carp scroll from surplus crate
2016-09-07 21:45:14 -07:00