359c5896ed
Merge remote-tracking branch 'upstream/master' into meido
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-22 16:19:43 -03:00
dc39560e02
adds suit sensor menu
2014-12-21 21:04:35 -08:00
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
f1101f77a9
Adds 3 more scarves
...
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
25cc2999b0
Refactors snowflake AI hosting in ninja
...
why did i volunteer for this
It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.
the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
d2c85dc9c4
Merge branch 'master' into meido
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-18 17:47:55 -03:00
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
62b99c7007
Adds scarfs
...
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
a6e12c2ea9
warden bug, warden belt, backpacks
2014-12-17 09:19:04 -08:00
63f49ab04b
Adds maid and janimaid uniforms
...
These two are available from the autodrobe.
Sprites by Nienhaus.
2014-12-17 14:03:43 -03:00
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
32f2028df1
Forgot to commit the locker changes
2014-12-16 22:38:51 -08:00
f0d80d487d
adds EMT caps
2014-12-16 21:04:27 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
d4c2cc3b64
MapChanges/ArmourSpriteChanges
2014-12-16 11:48:06 +08:00
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
1519e320ee
Merge pull request #6357 from tkdrg/funtimes
...
Fixes two runtimes
2014-12-15 10:05:38 -08:00
0864822177
Part1TestingTheWaters
2014-12-15 18:41:33 +08:00
abe866f2d0
Fixes two runtimes
...
Related to issue #6351
Fixes facehuggers checking oreboxes for stat.
Fixes monkeys dropping HUDs runtime.
2014-12-14 14:40:14 -03:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
4c61970531
fixes jumpsuit hiding breaking your jumpsuit
2014-12-14 06:33:13 -08:00
84940a7832
hardsuit using update_icons()
2014-12-14 02:49:41 -08:00
0b5e182a83
Merge pull request #6232 from Incoming5643/happykwanzaa
...
Don't they know it's christmas time at all?
2014-12-13 22:57:19 -08:00
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
32038f1afa
revert jumpsuit armor changes
2014-12-13 00:38:31 -08:00
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
250bbd7f4d
fixes bug with a sec uniform, buffs engie hardsuits
2014-12-11 17:35:10 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
4237c406e4
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
2014-12-08 13:53:31 -03:00
e2c15d5210
Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome
...
Conflicts:
code/modules/hydroponics/hydroponics.dm
2014-12-08 13:48:22 -03:00
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
c158599253
Christmas santa hats!
2014-12-07 20:02:03 -08:00
3e97e935af
/datum/atom_hud (Passive HUDs) bugfixes
...
Moves antag_hud image and datum to mind instead of mob.
Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.
Fixes #6206
Fixes #6209
2014-12-06 15:05:23 -03:00
953bffd23b
compile error fix
2014-12-05 21:27:52 -08:00
0f3f0659d1
coats to lockers, winter boots
2014-12-05 21:14:49 -08:00
1307b1143b
Readds the x-mas trees to their traditional locations, the bar and church
...
Readds the Festivus Pole to the RD's office, since the break room is gone
Makes a wizard robe variation of the santa outfit without all the bonus effects (not spaceworthy, can't hold literally everything) so the crew can experience the joy of meeting and subsiquently killing santa claus
Fixes #6230 as a matter of course (someone needs to generalize it to just work for all maps at once)
2014-12-05 12:41:55 -05:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
acd956179b
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-12-04 20:47:29 -03:00
tkdrg
paprka
MrPerson
Razharas
Cheridan
Cheridan
Razharas
phil235
Steelpoint
hornygranny
Swag McYolosteinen
Incoming