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
e29b224ef2
Fixes flame armour
2015-12-01 02:00:35 -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
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
fe65e8a3b4
puts cloak in suit slot
2015-11-29 00:52:27 -06:00
2ef127add8
Makes snowman body
2015-11-28 01:49:19 -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
86e98947c3
Updated Templar Armour
2015-11-27 14:01:25 -06:00
79550bf8ac
Updated sprites
2015-11-27 13:34:23 -06:00
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
7c64602766
fixes the captain being a worm(spelling error).
2015-11-07 14:18:08 -08:00
3c03fa9b24
Makes cloaks into exosuit items. Modifies their armor values so they decent replacement for existing head of staff exosuit items. Compiles this time, I promise.
2015-11-07 01:31:57 -08:00
b22e0801a8
Merge pull request #12539 from KorPhaeron/pillshere
...
Zombies
2015-10-27 19:38:39 +11:00
e2e9be42b8
Zombie fixes
2015-10-27 02:35:00 -05:00
da84fcd8d2
- Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
...
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00
8e82cf324a
Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
...
Conflicts:
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
6debfed196
Adds more storage possibilities. Honk.
2015-10-02 00:25:39 -04:00
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04:00
cca48e61f1
SecBioSuit
2015-09-22 23:17:49 +08:00
41e426c5ef
Merge pull request #11744 from Thunder12345/cap-uniform
...
Added a new formal jacket to the captain's locker
2015-09-14 20:36:15 +10:00
4c64e11155
Silly line, trying to escape the delete key
2015-09-13 17:12:49 +01:00
6724b7bca7
Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured
2015-09-13 17:10:30 +01:00
cf2d0903f6
Added a new formal jacket to the captain's locker
2015-09-12 21:10:16 +01:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
99c84a79ea
fixes ablative reflect
2015-08-27 22:29:20 +02:00
b81ea02552
Hardsuit helmets will now store the suit as a var and they will qdel eachother when deleted.
2015-08-24 04:25:47 -03:00
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
008c70acea
Fixed inbuilt jetpacks dropping when suit is deleted.
2015-08-08 04:05:51 +01:00
2d2e1acf6a
Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder
2015-07-28 20:19:26 +01:00
26190b90ee
Adds carp spacesuit + mask, carp costume and ian costume.
2015-07-28 00:06:32 +01:00
8cfda1f2ba
Leather jacket and leather overcoat can now hold the same things as military jacket.
2015-07-23 01:00:41 +02:00
c900894030
Gives the Military Jacket some suit storage options. It can hold all the minor items that the bomber jacket can, as well as the 10mm pistol, the .357 revolver, and the .38
...
Made the military jacket into an actual jacket.
2015-07-21 18:12:31 +02:00
d39a2ef5db
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-18 07:51:17 -05:00
3537d754b3
Merge pull request #10345 from Steelpoint/HoSArm
...
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
1e727e34eb
BulTo40
2015-07-05 19:05:09 +08:00
a3f5be0b21
HoSArmour
2015-07-03 21:08:21 +08:00
d07e315ddf
Squashed
2015-06-28 12:11:05 -06:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
40a90ab8df
ayy lmao merge conflicts
2015-06-27 00:02:46 -05:00
50c1fc487e
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-26 23:49:43 -05:00
16cdc39d2f
Converts the jacket to a cosmetic, added to autodrobe and clothesmate, doesn't spawn in closets anymore
2015-06-26 23:48:18 -05:00
88ee215429
Removed arm protection from jacket
2015-06-26 02:37:54 -05:00
duncathan salt
KorPhaeron
swankcookie
Dorsisdwarf
TechnoAlchemist
Jordie
KorPhaeron
phil235
bgobandit
Steelpoint
Thunder12345
bear1ake
c0
AnturK
Aranclanos
Cheridan
xxalpha
CosmicScientist
phil235
WJohn
Firecage
Ikarrus
TheVekter
TheVekter