Commit Graph

175 Commits

Author SHA1 Message Date
kevinz000
3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
2019-06-08 01:07:18 -07:00
kevinz000
70bad08f95 Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
2019-05-31 19:23:03 -07:00
kevinz000
7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
2019-05-31 17:52:40 -07:00
kevinz000
c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
2019-05-31 17:52:25 -07:00
kevinz000
4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
2019-05-31 17:50:59 -07:00
kevinz000
61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
2019-05-31 17:47:08 -07:00
kevinz000
14d763bd1d Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
2019-05-31 17:46:44 -07:00
kevinz000
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
Ghommie
8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Useroth
bd4108c094 ... 2019-05-28 09:04:13 +02:00
Useroth
939eb35a3f Tae-clown-do v1 2019-05-28 09:02:26 +02:00
kevinz000
45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151
suppressors now only cost 1 tc
2019-05-27 03:27:22 -07:00
kevinz000
433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150
Binary Translator Key costs 2 from 5
2019-05-27 03:26:45 -07:00
kevinz000
625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149
Adv Syndicate Surgery Duffel Bag tweaks
2019-05-27 03:26:26 -07:00
kevinz000
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
kevinz000
b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154
ultra clown fireing pins
2019-05-27 03:24:47 -07:00
Trilbyspaceclone
962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
Trilbyspaceclone
6b05ccbda8 Update uplink_items.dm 2019-05-26 22:51:22 -04:00
Trilbyspaceclone
21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
Trilbyspaceclone
254e84e46b Update uplink_items.dm 2019-05-26 22:44:17 -04:00
Trilbyspaceclone
b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
Trilbyspaceclone
ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
Trilbyspaceclone
4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
Trilbyspaceclone
a633d3202a It was 2019-05-26 22:22:31 -04:00
Trilbyspaceclone
2dde7e8451 Update uplink_items.dm 2019-05-26 22:18:56 -04:00
Trilbyspaceclone
7bc3aa4cf1 Update uplink_items.dm 2019-05-26 22:11:36 -04:00
Trilbyspaceclone
5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone
a628c81474 Update uplink_items.dm 2019-05-26 21:56:37 -04:00
Trilbyspaceclone
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
Trilbyspaceclone
86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
kevinz000
fb9d05f052 Merge pull request #8000 from Trilbyspaceclone/patch-60
More clown uplink only items
2019-02-27 16:18:54 -08:00
Trilbyspaceclone
b4d22822cb As kev requested 2019-02-22 11:01:18 -05:00
Trilbyspaceclone
c9c185b3e1 2 out of 5 2019-02-14 19:12:10 -05:00
Trilbyspaceclone
4e68eebe2a Grammar isnt a thing cats do 2019-02-14 19:09:57 -05:00
Trilbyspaceclone
0379bd2b89 grammar what is that? 2019-02-14 17:10:45 -05:00
Trilbyspaceclone
e1dc0ef51b Update uplink_items.dm 2019-02-14 17:03:42 -05:00
Trilbyspaceclone
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
Trilbyspaceclone
09df2edf25 Update uplink_items.dm (#7877) 2019-01-03 04:36:52 -08:00
Trilbyspaceclone
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
deathride58
af68012d7d makes teleporters viable - increases the range of all launchpads across the board (#7729) 2018-11-16 14:46:13 -08:00
nik707
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
deathride58
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
deathride58
6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
deathride58
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
AnturK
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