081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
22deb5b46e
Added Description Text for Pet Collars
...
Because we know they're not some sort of space-tie.
2015-04-09 04:15:38 +01:00
2e4a8fcce8
Recieve --> receive grammarfix
...
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.
Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
4f43fff199
Issue fixes! All that, and more!
2015-03-29 03:54:41 +01:00
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
e5c3d421db
Adds renaming, Adds collars to pet crates
2015-03-22 13:16:30 -05:00
521820f289
Makes the white dress a suit.
2015-03-22 19:13:15 +01:00
e5637301ba
Adds a jester suit and a white dress, both by Nienhaus.
2015-03-22 19:12:25 +01:00
f180506a2d
finished
2015-03-18 23:59:23 -05:00
7149f0382d
Adds Pet Collars!
...
Map needs update now
2015-03-18 21:27:21 -05:00
0d2837935b
Adds absolute territory
2015-03-18 17:13:50 -04:00
1b1ee50b00
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
44ea489940
THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN
...
- adds The Griffin costume to the autodrobe
2015-02-23 17:30:17 -05:00
e8fb3d1f05
THE OWL RETURNS: PART 1: THE PLASMA RISES
...
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
2015-02-23 16:49:17 -05:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
c2c015a91a
Fixes conflicts, fixes casually worn uniforms looking weird
2015-02-15 13:07:06 -05:00
6811835f41
Modifies the fitted var to allow for clothing that looks good with female uniform generation save for the dickpixel(tm), FEMALE_UNIFORM_TOP.
...
Reclassified uniforms as needed. Most uniforms can now get some sort of variation without any sort of visual weirdness.
Uniforms with "enhanced" chests continue to be excluded for that very reason, ironically.
2015-02-10 17:56:55 -05:00
d78322bb42
Adds new schoolgirl uniform colours and adds ties and black skirt to clothesmate.
2015-02-10 06:47:13 -06:00
b3f164e131
Ports plaid skirts from Baystation12.
2015-02-10 06:10:26 -06:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
01bf5b343f
Adds purple shorts.
2015-02-04 01:23:58 -06:00
890b3800e6
some clothing changes
2015-02-03 09:00:51 -08:00
1401c8043b
Fixes cargotech jumpsuit onmob sprite (revert the sprite to the old grey+lightbrown one)
...
Fixes a couple jumpsuit not having the wrong or no inhand sprite.
2015-01-19 21:14:43 +01:00
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
3dc5a04038
Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
...
Conflicts:
config/admins.txt
2015-01-12 15:55:51 -05:00
f8573ba257
u know what it is
2015-01-11 16:08:21 -05:00
88e124e88c
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit."
2015-01-07 09:12:39 -08:00
2a71a8ee12
Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/under/jobs/security.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/clothing/under/ties.dm
icons/mob/head.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/uniforms.dmi
2015-01-07 14:59:24 +01:00
d57256cf11
makes the second cook spawn in short order clothes, fixes chef uniform
2014-12-28 01:12:49 -08:00
96237278fa
Merge branch 'master' into meido
...
Conflicts:
code/modules/clothing/under/miscellaneous.dm
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-25 12:41:29 -03:00
0b16835c47
New Dresses and resprited Black Tango Dress
2014-12-22 18:23:11 -05:00
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
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
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
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
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
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
32038f1afa
revert jumpsuit armor changes
2014-12-13 00:38:31 -08:00
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -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
35cbf8918e
Adds new undershirts, jeans and pants by WalterJe
...
Adds the undershirts by JStheguy
Ports some pants by JStheguy from NTstation
Ports the clothes vending machine from NTstation
Adds the clothesmate restock icon by WJohnston
2014-11-23 13:58:32 -03:00
047de23ee0
Reverts chef description and fixes radiation suit label.
2014-11-21 10:59:15 -05:00
9d889797f5
Fixes collectable hat capitalization and changes the descriptions on some items.
2014-11-21 10:24:12 -05:00
2eb28a2a80
Fixes spelling errors in clothing item descriptions and adds/edits descriptions for others.
2014-11-20 23:26:10 -05:00
phil235
Wolfie13
kingofkosmos
Fayrik
Swag McYolosteinen
Cheridan
Incoming
MMMiracles
dannno
Remie Richards
TZK13
paprka
phil235
paprka
tkdrg
Mandurrrh
Xhuis