Commit Graph

698 Commits

Author SHA1 Message Date
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
Robertha89
662a101bce adds xeno fat suit 2015-06-14 09:12:40 +02:00
SamCroswell
4e3f4bfa17 Adds Vision Flags for Helmets 2015-06-11 23:15:42 -04:00
SamCroswell
b6cd6b4384 Rewrites HUD Handling for Glasses 2015-06-11 21:42:15 -04:00
ZomgPonies
757650896a Merge pull request #1258 from Fox-McCloud/batons
Classic Baton Refactor
2015-06-07 14:08:31 -04:00
Fox-McCloud
e4cbc5619e Classic Baton Refactor 2015-06-05 18:01:50 -04:00
Fox-McCloud
7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04:00
Fox-McCloud
7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219
Various Minor Fixes
2015-05-30 07:00:48 -04:00
Krausus
755467ac20 Fixes examining those with limb stumps/accessories
Limb stumps would show as "He has a limb stump on his limb stump", and
accessories would be lowercased and worded poorly.
2015-05-30 05:35:18 -04:00
Krausus
9f1f0a9cfa Fixes quick-equipped accessories lingering in hands 2015-05-30 04:35:10 -04:00
Fox-McCloud
0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
Fox-McCloud
0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -04:00
Tigercat2000
0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07:00
Tigercat2000
9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
ZomgPonies
6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
FalseIncarnate
5cbd09f593 More Brooms and Horsemasks and Jerseys
Adds 2 Horsemasks to the AutoDrobe's hacked items list.

Adds 2 new crates to cargo: Team Jerseys Crate and Polo Supply Crate.
- Team Jerseys Crate (15 supply points) contains 4 red jerseys, 4 blue
jerseys, and 1 beach ball
- Polo Supply Crate (20 supply points) contains 6 brooms, 6 horse masks
(to put on the brooms), and 1 beach ball

Adds new jerseys: an alternative to athletic shorts that come in red and
blue. Red team is the NT Phi-ghters, Blue is the NT Pi-rates. Show your
team spirit today!
2015-05-16 04:14:08 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
ZomgPonies
bd71606cf6 Merge pull request #1010 from tigercat2000/GAAB
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
ZomgPonies
bfb997f3d2 Gave EN a prototype magnetic spell 2015-05-07 20:51:47 -04:00
ZomgPonies
547f606677 Gave EN's suit minor magnitis, also made affect machine people 2015-05-07 18:20:55 -04:00
ZomgPonies
7423d56c06 Adds E-N and gear 2015-05-07 16:12:43 -04:00
ZomgPonies
0a7d2b8697 Added griffin headgear caw ability 2015-05-07 16:00:29 -04:00
ZomgPonies
d2dc8030e8 Add hooting ability to owlman's mask 2015-05-07 15:33:54 -04:00
ZomgPonies
31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04:00
ZomgPonies
2cb22ac647 Finished adding LightnIan and the spells datum stuff 2015-05-05 19:52:38 -04:00
ZomgPonies
1fe9bf4a43 Merge pull request #928 from FreeStylaLT/notparadise2
Engineering/Atmos beret changes
2015-05-03 18:48:01 -04:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Fox-McCloud
6be72f97b8 forgot 2015-04-30 23:11:42 -04:00
Fox-McCloud
2b406e7d63 ACJ Buff 2015-04-30 21:53:05 -04:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Tigercat2000
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
Malkevin
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
Fox-McCloud
718ad57231 Buffs Reactive Tele-Armor 2015-04-11 03:33:49 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
SamCroswell
5d1ce61a7d Various Fixes 2015-04-06 12:39:14 -04:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
Fox-McCloud
b358a8ba1d oops 2015-03-26 10:31:13 -04:00
Fox-McCloud
56d6d7c9c8 Fixes 2015-03-26 10:27:04 -04:00
ZomgPonies
3db10c7c37 Merge pull request #635 from Fox-McCloud/Taperecorder
Taperecorder Rework
2015-03-24 08:01:16 -04:00
Fox-McCloud
aa5cdae070 Taperecorder Rework 2015-03-23 05:45:15 -04:00
Fox-McCloud
c576402ea9 Fixes There Not Being a Best Emag Use 2015-03-23 01:06:19 -04:00