Commit Graph

118 Commits

Author SHA1 Message Date
Tlaltecuhtli
325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548)
the default bulldog shotgun ammo makes sense now
2018-05-09 16:24:17 -05:00
Jordan Brown
5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc
Corrects brainwashing surgery program category
2018-05-03 08:41:23 -05:00
Jordan Brown
0a0875e447 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description
Corrects mistake in storage implant uplink description
2018-05-02 08:38:09 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000
8c9f4b9208 desc (#37435) 2018-04-27 02:37:44 -05:00
Grandmother of 50
43e0079981 Provides more control over uplink surplus chances. (#36983)
Cant wait for the epic balance prs that people will fight in
2018-04-11 05:16:32 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBot
d96b280383 [MIRROR] Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#5672)
* Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)

* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC

* Adds an dart-synthesizing dartgun for CMO/Chemist traitors
2018-02-23 17:42:03 -06:00
YPOQ
87d8be5287 Fixes noslip shoes not showing up in nuke ops uplink (#35621)
* Fixes noslip shoes not showing up for nuke ops

* Updates other references to GLOB.uplink_items

* Removes unnecessary SSticker checks
2018-02-19 22:08:44 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
81Denton
547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972)
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
2018-01-27 23:21:06 -06:00
Anonmare
039226dc8e Makes Chameleon Kits less restricted (#34799)
[Changelogs]: The Syndicate would like to apologise to its agents on under-manned stations for failing to supply them with proper disguises

🆑
balance: The Syndicate Chameleon Kit is now available during rounds of lower population. Because of course you can have an e-sword and revolver without restriction but disguising and RP is verboten because we deathmatch station now.
/🆑

[why]: I'd rather remove the restriction entirely but I'm sure someone will complain that a perfect disguise is OP on low-pop but Sleeping Carp/Revolver/etc isn't somehow
2018-01-26 19:57:22 -06:00
Jack Edge
a07c6c4d9e Nuke op intelligence potions also grant an internal ID
🆑 coiax
add: Syndicate intelligence potions also grant an internal syndicate ID
card to the simple animal granted intelligence. This effectively means
that Cayenne can open the airlocks on the Infiltrator.
/🆑

And also maintenance I guess. But she could already smash her way
through doors.

Why? So Cayenne can open airlocks on the infiltrator. That's why.
2018-01-26 02:59:04 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466
[MIRROR] Fake nuclear disks are even more convincing
2018-01-25 13:41:02 -06:00
coiax
481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
Jordan Brown
13a399b8be Merge pull request #34509 from Iamgoofball/patch-365
Super Surplus Crate
2018-01-17 07:29:04 -06:00
deathride58
071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges
ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
1e2e8b7ecb Fixes uplink_purchase_log GC error (#34119)
* Fixes uplink_purchase_log GC error

* Add missing GLOB.
2018-01-07 18:52:26 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
coiax
866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00
coiax
4840a9c418 Codespeak manual rebalance/recost (#33638)
🆑 coiax
balance: The codespeak manual now has unlimited uses and costs 3 TC.
fix: Nuke ops can now purchase the codespeak manual, as was intended.
/🆑

It's an item that's just used for communication security, and also light
memeing, so I'll make it cheaper.

Also fixes a bug where I didn't specify the item path for the nuke ops
version, so they couldn't buy it.
2017-12-18 21:22:29 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58
1eb0e42bb1 Update uplink_devices.dm 2017-12-10 18:04:11 -05:00
oranges
d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
deathride58
47960ab931 fixes conflict with base cit code, modularizes citadel uplink items file 2017-12-04 17:07:28 -05:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
LetterJay
2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
Michiyamenotehifunana
54a51a2fdb NEB Polishing
Toys now implemented in a better way, new sound effects, and new traitor variant.
2017-10-25 16:36:03 +08:00
Michiyamenotehifunana
33f2597e56 Adds Non-Eutactic Blades (eswords that look like swords)
Includes tator tot version and toy version, made in the autolathe because I suck. They're recolorable.
2017-10-24 19:35:26 +08:00
jughu
9848da0544 Blacklists holo injectors from surplus crates (#32001)
* Update uplink_item.dm

* Update uplink_item.dm
2017-10-23 22:54:24 -05:00
Armhulen
c518497e80 readds guardians to the uplink (#31616)
* LOL! LMAO! ROFLMAO!

* 12 + 18 = ??

* gang in [current_year]

* ok!
2017-10-14 15:19:19 -05:00
jughu
1cb06f855e Update uplink_item.dm (#31448) 2017-10-09 14:25:30 -05:00
Michiyamenotehifunana
8ac574108e Brings 10mm Soporific Description in-line with its nerfed stats
D'oh. Completely forgot about this. Now no one can complain that their rape gun instructions tell them 2 shots is enough when 3 is what you actually need.
2017-10-03 17:24:36 +08:00
Michiyamenotehifunana
59541efffb Wave 3 of guns
Reskinnable stetchkins, magrifle, flechette gun, Hyper-burst rifle, and 10mm soporific bullets.
2017-09-27 23:08:36 +08:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643)
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
2017-09-22 22:30:44 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
ShizCalev
f5f9ada39c Makes magillitis affect all Hominidae. (#30841) 2017-09-20 09:06:02 -05:00
Michiyamenotehifunana
1f84944dee Anti Tank Pistol Improvements and Implementation
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
2017-09-18 23:11:14 +08:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
BeeSting12
9e83717c92 Spetsnaz Pyro Bundle Rebalance (#30564)
* im gay

* oops did a thing wrong

* wew
2017-09-11 12:32:58 -05:00
CitadelStationBot
d959b7538a Decreases hacked ai module cost (#2557) 2017-09-04 04:14:48 -05:00