Cheridan
0f4aeb1357
Merge pull request #15793 from ChangelingRain/steelpunted
...
Adds 'Support and Mechanized Exosuits' and 'Space Suits and Hardsuits' categories to the syndicate uplink
2016-02-28 13:23:54 -06:00
Nerd Lord
50c3ac7c22
honk
2016-02-27 12:08:46 -05:00
Nerd Lord
2497b48b0d
adds mecha/support and space suit categories to the syndicate uplink
...
traitors can now properly buy the blood-red hardsuit
2016-02-27 11:55:00 -05:00
Cheridan
d51a1907f8
Merge pull request #15750 from Steelpoint/M90
...
C20r Buff | M90 Removal
2016-02-27 00:22:01 -06:00
Iamgoofball
872fa7acf0
>fuck up the pathing >it's all over now
2016-02-25 17:45:09 -08:00
Iamgoofball
3f9bd8586f
>add the chameleon kit >test everything but uplink
...
>it didn't work
🆑 Iamgoofball
bugfix: The Chameleon Kit is actually purchasable now. It doesn't give a single chameleon jumpsuit anymore.
/🆑
2016-02-25 17:40:42 -08:00
Steelpoint
628be2f67d
C20rChange
2016-02-25 15:54:37 +08:00
AndrewJacksonThe2nd
38f3f1dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
...
Conflicts:
code/game/objects/items.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
Robustin
408a302b20
Update uplink_item.dm
2016-02-22 17:23:47 -05:00
Robustin
b26337dc05
Update uplink_item.dm
2016-02-22 17:00:52 -05:00
Robustin
f31cc6e6cf
Update uplink_item.dm
2016-02-22 16:31:44 -05:00
AndrewJacksonThe2nd
5daae812f7
Chameleon PDA, fixes
2016-02-21 12:04:38 -08:00
AndrewJacksonThe2nd
5d5d2427f4
temp
2016-02-20 22:12:25 -08:00
PKPenguin321
0073700ff9
lowers cost of traitor surgery bag
...
it's literally never bought so why not
i made it only 3 instead of 2 because it would be too much value for just 2, especially when you consider the 15 brute saw
2016-02-13 17:24:24 -08:00
Cheridan
f0aae210c7
Merge pull request #15370 from PKPenguin321/patch-16
...
Separates Traitor EMP Flashlights from the EMP Kit, reduces TC prices (Remake)
2016-02-12 19:13:05 -06:00
duncathan salt
9258f042c9
Merge pull request #15374 from neersighted/put_it_in_me
...
Add autoimplanter to cybernetic implants in the uplink
2016-02-10 23:50:23 -06:00
duncathan salt
ca8e3c6a0a
Merge pull request #15157 from LanCartwright/nomorehardsuit
...
Removes hardsuit from bulldog bundle
2016-02-10 21:21:42 -06:00
Bjorn Neergaard
c453157bad
Add autoimplanter to cybernetic implants in the uplink
...
So ops don't have to buy the full bundle
Idea is thanks to @PkPenguin321
2016-02-09 20:22:33 -06:00
PKPenguin321
165975f9e5
actually adds the emplight to the uplink
...
im actually retarded
2016-02-09 16:49:24 -08:00
PKPenguin321
90a963d2ec
updates name/desc/price for emp kit, adds emplight to uplinks
...
where previously EMP kits would come with the flashlight, now they only have an implant and grenades. they're only 2 TC now, down from five.
the flashlight itself can now be bought separately for 2 TCs.
2016-02-09 16:44:43 -08:00
AnturK
f6f7943189
Adds C4 bag to uplink
2016-02-08 16:10:34 +01:00
tkdrg
0dbbcce675
Merge pull request #15216 from KorPhaeron/fixes_bulldogs
...
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
Bjorn Neergaard
b9c79680b9
Rename get_ui_data -> ui_data, remove useless shuffle from wires
2016-02-05 17:09:40 -06:00
Bjorn Neergaard
fc513f9a47
Add generic "screen" capability to tgui
...
Also fix typo found in uplinks, random uses of 'src'
2016-02-05 17:06:05 -06:00
Bjorn Neergaard
af19bff008
tgui sleepers and uplink search
...
Fix some state logic
Fix SVGs
display: based filtering
input component
Update syndicate colors
@ChangelingRain
2016-02-05 17:05:59 -06:00
KorPhaeron
2f6c9ec50e
Bulldog Fix
2016-02-05 12:06:53 -06:00
tkdrg
058f93a052
Merge pull request #14911 from MMMiracles/L6butbetter
...
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
Akke
4458aa9d73
no more hardsuit no more plasma flooding
2016-02-02 23:48:21 +00:00
MMMiracles
58c2972047
made AP rounds actually capable of denting people in bulletproof armor
2016-02-02 18:28:23 -05:00
tkdrg
f9885841f1
Merge pull request #15074 from Chiefwaffles/Slipocalypse
...
Adds Uplink Soap Clusterbang for 6TC
2016-02-01 00:01:33 -03:00
duncathan salt
ccba4396b1
Merge pull request #15105 from KorPhaeron/fish
...
Makes Cayenne a proper carp, adds sentience potion to nuke op uplink
2016-01-31 20:52:00 -06:00
Chiefwaffles
a4d5617289
Changed TC cost to 6.
2016-01-31 18:22:57 -08:00
Chiefwaffles
170b592377
Ups price to 4TC. Soap Spawnergrenade added to replace soap as payload.
2016-01-31 12:29:00 -08:00
KorPhaeron
15b713e1be
Cayenne is a proper carp
2016-01-30 22:09:42 -06:00
Chiefwaffles
efa5d2577b
Adds Slipocalypse Clusterbang for 2tc.
2016-01-30 00:58:51 -08:00
Akke
117f957787
removes fungal tb from traitor
2016-01-29 00:59:22 +00:00
Razharas
28e1e1d3b3
Merge pull request #14948 from neersighted/uplink_fix
...
Uplink fix
2016-01-28 03:09:09 +03:00
Razharas
d240bb49ef
Merge pull request #14900 from KorPhaeron/mosin
...
Adds dirt cheap surplus rifles to the nuke op uplink
2016-01-27 04:05:11 +03:00
Bjorn Neergaard
fb309f862d
Add feedback to uplink/uplink_item
...
A 'while I'm in here' thing
2016-01-26 18:22:02 -06:00
Bjorn Neergaard
12784269e5
Fix random telecrystals and surplus crate runtime
2016-01-26 17:57:11 -06:00
Bjorn Neergaard
7dcdda8ed0
Disable tgui autoupdate for uplinks
...
Only a single person can use one at any given moment, and no
external factors update them
2016-01-26 17:46:03 -06:00
Bjorn Neergaard
4fd5c1a9ed
Fix random item in the uplink
2016-01-26 17:17:02 -06:00
Bjorn Neergaard
838dd15e95
Fix syndie surplus crates
2016-01-26 17:14:05 -06:00
MMMiracles
e8186080fb
more name changing to fit
2016-01-26 09:49:13 -05:00
MMMiracles
045f2d480b
saw and bulldog changes fight me kiddo 1v1
2016-01-25 20:58:38 -05:00
KorPhaeron
8e1186ffd9
YOU GET A RIFLE YOU GET AMMO IF THE MAN IN FRONT OF YOU DIES etc
2016-01-25 17:12:21 -06:00
Bjorn Neergaard
87642fa588
tgui tank dispensers
2016-01-25 12:03:06 -06:00
Bjorn Neergaard
dbc64b7d28
tgui fire alarms
2016-01-25 12:02:59 -06:00
Bjorn Neergaard
5b3db3b6f7
Fix uplinks including items they should not in surplus crates
2016-01-23 18:56:37 -06:00
Bjorn Neergaard
99e5764719
Refactor pizza_bomb, tweak pizza_bomb sprites
...
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites
Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
