9c5745ce7d
Add flash_protect defines for 4 objects.
...
This commit adds flash_protect defines for the objects in this list:
- Type, flash_protect define
- /obj/item/clothing/glasses/hud/health_advanced, 1
- /obj/item/clothing/glasses/hud/security, 1
- /obj/item/clothing/helmet/space/eva, 0
- /obj/item/clothing/head/helmet/space/rig/medical, 0
2015-04-13 19:20:59 -07:00
9deb16dcdb
Improved eyecheck()
...
Changes flash/welder protection eyecheck() proc from several hard coded
item checks to a /var check for eye covering items, reducing the number
of IF statements and allowing greater flexibility as child items can
have a different protection level to their parent.
Created a new proc tintcheck()
-Items have a separate tint var to allow for items to protect
but not impair, such as space helmets.
-tintcheck() adds these up for eye covering locations
-life.dm uses this new proc when checking to apply the welder overlay
instead of hardcoded if statements
2015-04-13 17:57:38 -07:00
718ad57231
Buffs Reactive Tele-Armor
2015-04-11 03:33:49 -04:00
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
4e9daf6aa8
Merge pull request #746 from jack-fractal/write-research-debug
...
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
5d1ce61a7d
Various Fixes
2015-04-06 12:39:14 -04:00
a0e1cd5683
Nanotrasen Representative hat
...
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
b358a8ba1d
oops
2015-03-26 10:31:13 -04:00
56d6d7c9c8
Fixes
2015-03-26 10:27:04 -04:00
3db10c7c37
Merge pull request #635 from Fox-McCloud/Taperecorder
...
Taperecorder Rework
2015-03-24 08:01:16 -04:00
aa5cdae070
Taperecorder Rework
2015-03-23 05:45:15 -04:00
c576402ea9
Fixes There Not Being a Best Emag Use
2015-03-23 01:06:19 -04:00
a31cdc9091
Merge pull request #572 from SamCroswell/NinjaDev
...
Ninja Restructure
2015-03-15 16:58:41 -04:00
62ae69c816
Ninja File Structure Rework
...
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.
Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
8477d382a7
Merge conflict Fix
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
7fda1b1fd5
Merge pull request #539 from ZomgPonies/plasma
...
Plasmamen Softsuit Fixes
2015-03-08 20:31:44 -04:00
355eca1d26
Remove pressure resistance values
2015-03-08 20:26:10 -04:00
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
00902cf5a7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plasma
...
Conflicts:
icons/mob/suit.dmi
2015-03-08 17:47:32 -04:00
479fb500ba
Some more plasmamen eva suit bugs
2015-03-08 17:34:32 -04:00
8829a90709
NT Rep + Blueshield Uniform Change
2015-03-08 16:59:01 -04:00
5bb63a7f63
Merge Conflict Resolution
...
Conflicts:
icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
c09c27958a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
maps/cyberiad.dmm
2015-03-08 20:10:49 +01:00
71c344013e
Merge pull request #518 from ZomgPonies/plasma
...
Adds Plasmaman to Karma Shop
2015-03-08 20:02:16 +01:00
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
b8b0fd13b8
Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/response_team.dm
maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
9b87487783
Minor Fixes
2015-03-07 23:13:00 -05:00
efd546d1e4
Ninja glove icon update, ninja suit toggle function
2015-03-07 19:54:00 -05:00
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
5fac18862e
Fixes Nightvision Glasses
...
Nightvision glasses no longer have a snowflake check, instead all
glasses have a see_darkness variable that determines if they see the
darkness overlay.
2015-03-05 18:25:20 -05:00
ede55cc8f5
Re-Adds Ninja Gear
2015-03-05 17:17:52 -05:00
e30d4cc35d
Merge branch 'master' of https://github.com/Markolie/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-04 19:34:21 +01:00
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
a911b53e8b
Life Proc Changes--Cold Space and and Temp Handling
2015-03-04 05:42:12 -05:00
463204c913
Merge pull request #493 from Markolie/master
...
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
3bed31e08c
Chemistry Cleanup and Fixes
2015-03-01 16:34:23 -05:00
8a41ab2025
Taking off mask disables internals
2015-02-28 19:51:14 +01:00
5e4539157c
Add minimum age for drones/ERT
2015-02-28 19:40:56 +01:00
e4328a7f5e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
2015-02-28 17:13:53 +01:00
f7426c8d72
Add bandanas, mask toggling, camo armor jacket and bugfixes
2015-02-28 17:09:45 +01:00
d89c885a14
Merge pull request #435 from ZomgPonies/fixuns
...
Various fixings and additions
2015-02-27 18:22:35 +01:00
20ac07de8d
Bug fixes
2015-02-27 17:51:57 +01:00
54f4dda1b7
Made plasmamen suits EVA
2015-02-26 17:42:17 -05:00
bdb54c4378
Adds leather chaps for both regular and fat people
2015-02-26 16:56:28 -05:00
eaeb045afe
Unique suits for plasmamen jobs
2015-02-26 13:32:42 -05:00
ccfb89199e
New sea admiral suit and hat
2015-02-26 12:58:20 -05:00
eea58c6951
Merge pull request #415 from ZomgPonies/superhero
...
Superhero Part 2: Owlman vs. The Griffin!
2015-02-26 00:59:37 +01:00
Tigercat2000