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
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
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
e9ea0d8dc9
Merge pull request #13275 from swankcookie/snowman
...
Adds Snowman costume
2015-11-29 21:08:11 +11:00
7b1a92885c
Merge pull request #13024 from TheNightingale/Nighting
...
Elite Syndicate Hardsuit
2015-11-29 21:05:36 +11:00
fe65e8a3b4
puts cloak in suit slot
2015-11-29 00:52:27 -06:00
611fb49c1c
Wake me up inside
2015-11-29 00:58:30 -05:00
dfc025db36
Missed some lines
2015-11-28 23:14:38 -06:00
5ef5a57f73
removes relative pathing
2015-11-28 23:10:14 -06:00
2ef127add8
Makes snowman body
2015-11-28 01:49:19 -06:00
1b0bfaaef9
creates snowman head
...
Signed-off-by: swankcookie
2015-11-28 00:30:09 -06:00
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
53c7f8920b
Merge pull request #13260 from KorPhaeron/godwillsit
...
Updated Templar Armour
2015-11-27 21:00:58 +00:00
49ad07b58c
Aligns helmet properly
2015-11-27 14:28:44 -06:00
86e98947c3
Updated Templar Armour
2015-11-27 14:01:25 -06:00
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
79550bf8ac
Updated sprites
2015-11-27 13:34:23 -06:00
ce9ea0ca46
FUCK THIS FUCK EVERYTHING
2015-11-26 22:22:07 -05:00
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
c98a7a0d7e
Fixes merge conflicts, also a minor slipup with flags
2015-11-17 20:59:43 -05:00
160506b401
Unfucking shit ass plasma memes part 2
2015-11-17 20:38:56 -05:00
1f9f0dfc40
Adds subtypesof(). It's shorthand for typesof(path) - path.
...
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
5cdeabe0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into cakehatbugs
...
Conflicts:
code/modules/clothing/head/misc_special.dm
2015-11-15 16:30:03 -05:00
dca36b1723
* Elite Syndicate hardsuit added
...
** Operative-only; fireproof, with bonus resistances
** Added to Operative uplinks
2015-11-14 17:43:43 +00:00
8c694d9fc0
R&D and Misc Fixes/Tweaks
...
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.
Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
2015-11-14 13:35:05 -03:00
ef6af4ef5b
Unfucking shit ass plasma memes part 1
2015-11-13 21:28:00 -05:00
a6eaf76d72
Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug.
2015-11-12 21:54:08 -05:00
e02831d5b1
Reagents can no longer be determined by examining a reagent container without the proper apparatus. Silicons and ghosts can always see reagents.
...
Science goggles now allow reagents to be seen on examine. In addition, chemists now start wearing them. The bartender has a pair that looks and functions like sunglasses.
2015-11-12 23:01:33 +01:00
6a2c3b3fb1
Adds sprites for the most part.
2015-11-11 15:44:59 -05:00
KorPhaeron
duncathan salt
Cheridan
bgobandit
Jordie0608
swankcookie
as334
KorPhaeron
Dorsisdwarf
Remie Richards
YotaXP
Incoming
TheNightingale
Tkdrg
Xhuis