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
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
