Commit Graph

73 Commits

Author SHA1 Message Date
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
kevinz000
1b0bbb8c86 Merge branch 'master' into upstream-merge-30113 2017-08-29 20:02:14 -07:00
CitadelStationBot
993b452729 Fixes surplus log icons. 2017-08-28 02:20:11 -05:00
CitadelStationBot
cd11c01c42 Adds magillitis, a traitor serum for geneticists & CMOs 2017-08-26 11:07:42 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
cebutris
099b908d64 Fixes traitor holoparasites (#1904)
* fixes holoparasites

* adds #1051 and #1066

* as it turns out I'm blind

* fixes line 500 indentation
2017-07-15 11:48:56 -07:00
ktccd
6d3123f63c Readds borers (#1999)
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
a63fbd9286 Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
[MIRROR] Ports Goonchat
2017-06-19 17:25:18 -05:00
LetterJay
a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
LetterJay
ff8b2acf9e Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
2017-06-14 08:58:35 -05:00
LetterJay
e66e029108 Merge pull request #1537 from Citadel-Station-13/upstream-merge-28299
[MIRROR] Clarification on hardsuit variants in traitor uplink
2017-06-13 00:49:08 -05:00
CitadelStationBot
b1da43d3f7 Clarification on hardsuit variants in traitor uplink 2017-06-11 08:29:25 -05:00
CitadelStationBot
4bd99124de Adds F.R.A.M.E. cartridge 2017-06-10 12:18:31 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
06187dd178 Syndicate Uplink - Typos & Grammar mk2 2017-06-07 14:56:22 -05:00
CitadelStationBot
0455bf5f9a we have to move forward with grammar fixes (#1397) 2017-06-04 09:04:03 -07:00
CitadelStationBot
c82c71a6c1 Removes poison pen. (#1295) 2017-06-03 06:39:23 -07:00
CitadelStationBot
4a84f13ed0 Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#1359) 2017-06-03 06:35:03 -07:00
CitadelStationBot
dfcd326337 [MIRROR] Typos in syndicate uplink descriptions (#1341)
* Typos in syndicate uplink descriptions

* Delete uplink_item.dm.rej
2017-06-03 06:28:48 -07:00
CitadelStationBot
264cbf040b Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#1350) 2017-06-02 21:16:56 -07:00
CitadelStationBot
0b44c77bfb UPDATE: Removes airlock charge from uplink (#1216) 2017-05-27 13:37:45 -07:00
CitadelStationBot
63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00
CitadelStationBot
9e2d43fd80 KA Pressure Mods are now a traitor miner item 2017-05-22 08:20:07 -05:00
LetterJay
4d48592008 Merge pull request #1051 from cebutris/holofixes
No More Free Parasites
2017-05-19 22:46:30 -05:00
CitadelStationBot
c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
cebutris
893eb92833 no more free parasites 2017-05-18 18:04:42 -04:00
CitadelStationBot
552433143e Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC 2017-05-18 16:37:07 -05:00
CitadelStationBot
e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879)
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
2017-05-18 07:12:13 -05:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
914ae0cc4f You can now buy double eswords from the uplink, but you can no longer use two eswords to construct them (#891) 2017-05-10 16:04:42 -07:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
7d697b153b Merge pull request #686 from Citadel-Station-13/upstream-merge-26737
[MIRROR] Makes surplus crates less likely to contain implants
2017-05-02 03:04:09 -05:00