Commit Graph
160 Commits
Author SHA1 Message Date
kevinz000andGitHub 854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
2019-05-31 17:43:53 -07:00
kevinz000andGitHub 45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151
suppressors now only cost 1 tc
2019-05-27 03:27:22 -07:00
kevinz000andGitHub 433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150
Binary Translator Key costs 2 from 5
2019-05-27 03:26:45 -07:00
kevinz000andGitHub 625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149
Adv Syndicate Surgery Duffel Bag tweaks
2019-05-27 03:26:26 -07:00
kevinz000andGitHub 2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143
Makes laser scatter shot cost 4 not 5
2019-05-27 03:25:56 -07:00
kevinz000andGitHub b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154
ultra clown fireing pins
2019-05-27 03:24:47 -07:00
TrilbyspacecloneandGitHub 962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
TrilbyspacecloneandGitHub 21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
TrilbyspacecloneandGitHub b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
TrilbyspacecloneandGitHub ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
TrilbyspacecloneandGitHub 4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
TrilbyspacecloneandGitHub a633d3202a It was 2019-05-26 22:22:31 -04:00
TrilbyspacecloneandGitHub 5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
TrilbyspacecloneandGitHub 06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
Useroth 4d75eca582 Well, that was surely an interesting thing to code. 2019-05-17 16:22:17 +02:00
TrilbyspacecloneandGitHub 86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
kevinz000andGitHub fb9d05f052 Merge pull request #8000 from Trilbyspaceclone/patch-60
More clown uplink only items
2019-02-27 16:18:54 -08:00
TrilbyspacecloneandGitHub b4d22822cb As kev requested 2019-02-22 11:01:18 -05:00
TrilbyspacecloneandGitHub c9c185b3e1 2 out of 5 2019-02-14 19:12:10 -05:00
TrilbyspacecloneandGitHub 4e68eebe2a Grammar isnt a thing cats do 2019-02-14 19:09:57 -05:00
TrilbyspacecloneandGitHub 0379bd2b89 grammar what is that? 2019-02-14 17:10:45 -05:00
TrilbyspacecloneandGitHub e1dc0ef51b Update uplink_items.dm 2019-02-14 17:03:42 -05:00
Trilbyspacecloneandkevinz000 ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08:00
Trilbyspacecloneandkevinz000 09df2edf25 Update uplink_items.dm (#7877) 2019-01-03 04:36:52 -08:00
Trilbyspacecloneandkevinz000 1f1c5b3710 [Ready] Adds in a scatter shot Bulldog drum! (#7863)
* Fixing updater

* adds the ammo

* Update uplink_items.dm

* Update shotgun.dm

* Update uplink_items.dm
2018-12-31 03:11:44 -08:00
deathride58andkevinz000 af68012d7d makes teleporters viable - increases the range of all launchpads across the board (#7729) 2018-11-16 14:46:13 -08:00
nik707andkevinz000 13cb1d1c8a holy fuck this is broken (#7638) 2018-11-09 19:19:11 -08:00
Poojawa b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58andkevinz000 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
deathride58andkevinz000 6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
deathride58andkevinz000 f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
AnturKandletterjay cc1070c7db Cleans up other components destroys (#38930)
* wearertargeting destroy

* Why did these variables even existed.

* ....
2018-07-06 11:39:42 -05:00
deathride58 759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
kevinz000andletterjay 561c2179f8 Fixes and adds blast cannons to traitor science uplink items (#38093)
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-21 18:38:46 -05:00
CitadelStationBotandkevinz000 a298f20fa5 [MIRROR] [s] Fixes syndicate sentience exploit (#7021)
* Fixes syndicate sentience exploit (#38299)

* [s] Fixes syndicate sentience exploit
2018-06-05 23:14:48 -07:00
CitadelStationBotandkevinz000 de73153ccb [MIRROR] Fixes uplink refunds (#7014)
* Fixes uplink refunds (#38272)

* Fixes uplink refunds

* Whoops

* Sure

* Fixes uplink refunds
2018-06-05 11:19:33 -07:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJayandGitHub 0cf88041e0 Merge pull request #6915 from Citadel-Station-13/upstream-merge-37864
[MIRROR] Ports gloves of the north star from Hippie
2018-05-27 14:41:19 -05:00
GuyonBroadwayandletterjay 0082b0f2c0 Ports gloves of the north star from Hippie (#37864)
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
2018-05-27 11:40:47 -05:00
ShizCalevandletterjay 786b062f61 Capitalizes CentCom (#38086)
* Capitalized CentCom

* neediful
2018-05-27 11:40:12 -05:00
Tlaltecuhtliandletterjay 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 BrownandCitadelStationBot 5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc
Corrects brainwashing surgery program category
2018-05-03 08:41:23 -05:00
Jordan BrownandCitadelStationBot 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
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000andCitadelStationBot 8c9f4b9208 desc (#37435) 2018-04-27 02:37:44 -05:00
Grandmother of 50andCitadelStationBot 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
ArmhulenandCitadelStationBot 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CruixandCitadelStationBot b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00