eae13b9e06
Reactive tesla armor uses the tesla lightning bolts instead of revenant lightning
2016-01-12 22:54:50 -05:00
16bf636167
Helmets
2016-01-08 08:15:46 -06:00
3cf26018de
Small grammar fix to shielded message.
...
Fixes #14297
Added span class and reworded message while trying to keep the flavour
of text.
NB: This time I hopefully wont be such a pleb when trying to help.
2016-01-04 04:14:20 +00:00
e681243c44
Merge pull request #14151 from SouDescolado/patch-1
...
Add telescopic baton item to detective trenchcoat
2015-12-30 18:12:09 -03:00
f04936251a
Merge pull request #14149 from SouDescolado/patch-2
...
Add telescopic baton item to detective armor
2015-12-30 18:10:20 -03:00
548549409b
Update jobs.dm
...
/obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic
2015-12-29 17:27:17 -02:00
16f754502a
Update armor.dm
...
/obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic
2015-12-29 17:26:14 -02:00
c38ca9fc92
Add telescopic baton item to detective armor
...
Add telescopic baton item to detective armor
2015-12-29 16:17:56 -02:00
ed6f41f6de
Add telescopic baton item to detective trenchcoat
...
Add telescopic baton item to detective trenchcoat
2015-12-29 16:16:13 -02:00
f77ac2a14e
tactical gear
2015-12-22 13:59:02 -06:00
c00e773b6d
Merge pull request #13818 from LanCartwright/nukeopsrenovation
...
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
060ed21b7c
adds so much more shit
2015-12-20 20:59:23 +00:00
bde3995bc1
Merge pull request #13790 from tkdrg/niggers
...
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
1ab5e80458
Tesla map removal to fix merge
2015-12-19 12:32:50 -08:00
92240a9d95
Fixes invisible mask exploits
...
This code is awful and full of copy-paste and I can't be assed/can't
manage to figure out how to fix it properly so I just got the hammer and
made it always update everything whenever you toggle a helmet. Exploit's
dead at least.
Fixes #13486
2015-12-18 21:40:23 -03:00
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
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
af6f8c04a6
Admin items
2015-12-17 01:57:08 -06:00
40941c636d
necklaces again
...
round three let's go
2015-12-16 20:47:00 -08:00
ddc3bcf318
Recharge fix
2015-12-16 20:02:04 -06:00
9e22d7be4e
Shielded hardsuits
2015-12-16 19:57:52 -06:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
2f457588ef
Merge pull request #13573 from AnturK/medgun
...
Adds Med Beam Gun
2015-12-16 21:48:10 +11:00
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
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
d228f911fa
Merge pull request #13522 from KorPhaeron/just_an_illusion
...
Reactive Illusion Armour
2015-12-12 19:07:30 -06:00
45c06ae2cd
Merge pull request #13555 from bgobandit/sexyhonk
...
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
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
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
73471eb8b1
sexy clown is now a sexy object oriented clown
2015-12-10 19:19:03 -05:00
92d86dd369
Adds mats/origintech/burn_state to more items.
2015-12-10 15:32:28 -05:00
5f293c1d2b
The sexy clown jumpsuit now reacts properly on hit.
2015-12-10 15:09:51 -05:00
9210f7459a
Reactive Fixes
2015-12-10 04:32:31 -06:00
7d642e052a
Tweaks to illusions to make them respond faster
2015-12-09 09:36:03 -06:00
ff56ebaa68
Reactive illusion armour
2015-12-09 08:58:26 -06:00
b3992868d5
Merge pull request #13326 from Jordie0608/doyouthinkthesyndicatehaveadedicatedfashiondesigner
...
Adds nt's sprite for syndielite suit
2015-12-08 11:44:24 -06:00
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
8856d5981c
Moves continue/return to new lines
2015-12-07 18:51:31 -06:00
ebede4be34
Visible messages for reactive armour are actually visible
2015-12-06 17:23:44 -06:00
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
3e5e9086c0
fix
2015-12-01 21:52:35 -06:00
e29b224ef2
Fixes flame armour
2015-12-01 02:00:35 -06:00
37d1111685
Merge pull request #13310 from swankcookie/Cloak_fix
...
puts cloak in suit slot
2015-11-30 21:34:52 -06:00
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
c32fca7673
Redoes reactive armour
2015-11-30 00:04:05 -06:00
9705746625
adds nt's sprite for syndielite suit
2015-11-30 15:43:47 +11:00
77b841fe9b
Merge pull request #13305 from KorPhaeron/hardhat
...
Removes relative pathing in hardhat.dm
2015-11-29 17:30:27 -06:00
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
53d66e698c
unneeded addition, i guess
2015-11-29 12:58:46 -06:00
dc98e67f05
Just fuck my shit up fam
2015-11-29 13:48:58 -05:00
Nerd Lord
KorPhaeron
Michael Gartley
tkdrg
SouDescolado
Lularian
Akke
Cheridan
AndrewJacksonThe2nd
bgobandit
PKPenguin321
KorPhaeron
oranges
Jordie
duncathan salt
AnturK
swankcookie
as334