 tkdrg
|
b9ebbb6ed6
|
Merge pull request #13729 from KorPhaeron/admin_items
Grey Tide + Tesla Armor
|
2015-12-18 18:01:38 -03:00 |
|
 bgobandit
|
a2241e0f6f
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
Conflicts:
code/modules/client/preferences.dm
icons/mob/head.dmi
tgstation.dme
|
2015-12-17 20:12:32 -05:00 |
|
 KorPhaeron
|
af6f8c04a6
|
Admin items
|
2015-12-17 01:57:08 -06:00 |
|
 PKPenguin321
|
40941c636d
|
necklaces again
round three let's go
|
2015-12-16 20:47:00 -08:00 |
|
 KorPhaeron
|
ddc3bcf318
|
Recharge fix
|
2015-12-16 20:02:04 -06:00 |
|
|
KorPhaeron
|
9e22d7be4e
|
Shielded hardsuits
|
2015-12-16 19:57:52 -06:00 |
|
 oranges
|
134a76cc8f
|
Line ending apocalypse
|
2015-12-17 14:12:37 +13:00 |
|
 Jordie
|
2f457588ef
|
Merge pull request #13573 from AnturK/medgun
Adds Med Beam Gun
|
2015-12-16 21:48:10 +11:00 |
|
|
tkdrg
|
71fbb0e5f5
|
Merge pull request #13547 from KorPhaeron/reactive_fixes
Armor fixes (Reactive Teleport Armor and reflector vest name)
|
2015-12-16 04:00:20 -03:00 |
|
|
KorPhaeron
|
d8a37204e7
|
Makes burn_state use defines
|
2015-12-13 05:36:55 -06:00 |
|
 duncathan salt
|
d228f911fa
|
Merge pull request #13522 from KorPhaeron/just_an_illusion
Reactive Illusion Armour
|
2015-12-12 19:07:30 -06:00 |
|
 Cheridan
|
45c06ae2cd
|
Merge pull request #13555 from bgobandit/sexyhonk
Buffs the sexy clown.
|
2015-12-12 13:00:46 -06:00 |
|
 AnturK
|
ec85d5ceec
|
Fixes beam crossing
Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
|
2015-12-12 12:26:37 +01:00 |
|
|
bgobandit
|
5fa93e0e55
|
Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats.
|
2015-12-11 19:03:09 -05:00 |
|
|
bgobandit
|
73471eb8b1
|
sexy clown is now a sexy object oriented clown
|
2015-12-10 19:19:03 -05:00 |
|
|
bgobandit
|
92d86dd369
|
Adds mats/origintech/burn_state to more items.
|
2015-12-10 15:32:28 -05:00 |
|
|
bgobandit
|
5f293c1d2b
|
The sexy clown jumpsuit now reacts properly on hit.
|
2015-12-10 15:09:51 -05:00 |
|
|
KorPhaeron
|
9210f7459a
|
Reactive Fixes
|
2015-12-10 04:32:31 -06:00 |
|
|
KorPhaeron
|
7d642e052a
|
Tweaks to illusions to make them respond faster
|
2015-12-09 09:36:03 -06:00 |
|
|
KorPhaeron
|
ff56ebaa68
|
Reactive illusion armour
|
2015-12-09 08:58:26 -06:00 |
|
|
duncathan salt
|
b3992868d5
|
Merge pull request #13326 from Jordie0608/doyouthinkthesyndicatehaveadedicatedfashiondesigner
Adds nt's sprite for syndielite suit
|
2015-12-08 11:44:24 -06:00 |
|
|
duncathan salt
|
0472592b97
|
Merge pull request #13327 from KorPhaeron/reactive
check_shields() refactor
|
2015-12-07 19:58:17 -06:00 |
|
|
KorPhaeron
|
8856d5981c
|
Moves continue/return to new lines
|
2015-12-07 18:51:31 -06:00 |
|
|
KorPhaeron
|
ebede4be34
|
Visible messages for reactive armour are actually visible
|
2015-12-06 17:23:44 -06:00 |
|
|
Jordie0608
|
aad604588c
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into doyouthinkthesyndicatehaveadedicatedfashiondesigner
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
|
2015-12-03 15:12:52 +11:00 |
|
 swankcookie
|
3e5e9086c0
|
fix
|
2015-12-01 21:52:35 -06:00 |
|
|
KorPhaeron
|
e29b224ef2
|
Fixes flame armour
|
2015-12-01 02:00:35 -06:00 |
|
|
duncathan salt
|
37d1111685
|
Merge pull request #13310 from swankcookie/Cloak_fix
puts cloak in suit slot
|
2015-11-30 21:34:52 -06:00 |
|
|
KorPhaeron
|
2609adb29d
|
Blocking overhaul
|
2015-11-30 16:22:31 -06:00 |
|
|
KorPhaeron
|
c32fca7673
|
Redoes reactive armour
|
2015-11-30 00:04:05 -06:00 |
|
|
Jordie0608
|
9705746625
|
adds nt's sprite for syndielite suit
|
2015-11-30 15:43:47 +11:00 |
|
|
duncathan salt
|
77b841fe9b
|
Merge pull request #13305 from KorPhaeron/hardhat
Removes relative pathing in hardhat.dm
|
2015-11-29 17:30:27 -06:00 |
|
|
swankcookie
|
808adcfa9d
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cloak_fix
# Conflicts:
# icons/mob/suit.dmi
|
2015-11-29 13:38:16 -06:00 |
|
|
swankcookie
|
53d66e698c
|
unneeded addition, i guess
|
2015-11-29 12:58:46 -06:00 |
|
 as334
|
dc98e67f05
|
Just fuck my shit up fam
|
2015-11-29 13:48:58 -05:00 |
|
|
Jordie
|
e9ea0d8dc9
|
Merge pull request #13275 from swankcookie/snowman
Adds Snowman costume
|
2015-11-29 21:08:11 +11:00 |
|
|
Jordie
|
7b1a92885c
|
Merge pull request #13024 from TheNightingale/Nighting
Elite Syndicate Hardsuit
|
2015-11-29 21:05:36 +11:00 |
|
|
swankcookie
|
fe65e8a3b4
|
puts cloak in suit slot
|
2015-11-29 00:52:27 -06:00 |
|
|
as334
|
611fb49c1c
|
Wake me up inside
|
2015-11-29 00:58:30 -05:00 |
|
|
KorPhaeron
|
dfc025db36
|
Missed some lines
|
2015-11-28 23:14:38 -06:00 |
|
|
KorPhaeron
|
5ef5a57f73
|
removes relative pathing
|
2015-11-28 23:10:14 -06:00 |
|
|
swankcookie
|
2ef127add8
|
Makes snowman body
|
2015-11-28 01:49:19 -06:00 |
|
|
swankcookie
|
1b0bfaaef9
|
creates snowman head
Signed-off-by: swankcookie
|
2015-11-28 00:30:09 -06:00 |
|
 Dorsisdwarf
|
592553354f
|
Merge pull request #12899 from TechnoAlchemisto/master
Makes cloaks into Exosuits as god(I) intended.v2
|
2015-11-27 22:22:47 +00:00 |
|
 Remie Richards
|
53c7f8920b
|
Merge pull request #13260 from KorPhaeron/godwillsit
Updated Templar Armour
|
2015-11-27 21:00:58 +00:00 |
|
|
KorPhaeron
|
49ad07b58c
|
Aligns helmet properly
|
2015-11-27 14:28:44 -06:00 |
|
|
KorPhaeron
|
86e98947c3
|
Updated Templar Armour
|
2015-11-27 14:01:25 -06:00 |
|
|
duncathan salt
|
383e77db8a
|
Merge pull request #13220 from KorPhaeron/godwillsit
Adds knight armour
|
2015-11-27 13:58:08 -06:00 |
|
|
KorPhaeron
|
79550bf8ac
|
Updated sprites
|
2015-11-27 13:34:23 -06:00 |
|
|
as334
|
ce9ea0ca46
|
FUCK THIS FUCK EVERYTHING
|
2015-11-26 22:22:07 -05:00 |
|