Commit Graph

146 Commits

Author SHA1 Message Date
Fox-McCloud
a32b31d9b4 Adds Custom Strip Delays 2015-11-06 22:34:55 -05:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Fox-McCloud
c24953cc9a Merge pull request #1960 from KasparoVy/master
Adds Vox Sprites for all Remaining Clothing/Under/ + Ghost Uniform
2015-09-10 01:13:43 -04:00
KasparoVy
962234f7b4 Fixes Really Black Jumpsuit
Before, on wearing, it'd show the exact same sprite as the 'black
suit'-- while this was clearly unintended. Now shows the correct sprite
(for humans as well!)
2015-09-09 23:54:46 -04:00
KasparoVy
535805e4b4 Cleaning out all the species_fit and sprite_sheets 3 2015-09-08 22:10:33 -04:00
KasparoVy
5a9b733173 Cleaning out all the species_fit and sprite_sheets 2 2015-09-08 22:09:50 -04:00
KasparoVy
24240217c1 Cleaning out all the species_fit and sprite_sheets
Thanks @Fox_McCloud, I missed those
2015-09-08 22:09:24 -04:00
KasparoVy
e2a0445ce0 Adds Vox Sprite for Everything in clothing\under + Some Fixes
Exactly as the title says, however the fixes include sorting out the old
ripped Vox uniforms and moving all the species_fit and sprite_sheets.

Crapload of sprites being added here.
2015-09-08 21:54:34 -04:00
Tigercat2000
87026b48e1 Fixes wrong a_intent, blame 8fae0f02 2015-09-08 18:13:23 -07:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
TheDZD
fe2a3ef960 Merge pull request #1954 from Fox-McCloud/material-datums
Material datums, Recycler Refactor, and Additional Item Materials
2015-09-05 19:36:15 -04:00
KasparoVy
80ac7a3769 Adds Vox sprites for remaining medsci clothing items, reformats code
Adds Vox sprites for the Mortician's black scrubs (which was missing for
whatever reason), the Psychiatrist's regular uniform + turtleneck, and
all the 'new' suffixed uniforms (just in case).
2015-09-05 18:27:39 -04:00
KasparoVy
e5a5040363 Adds Vox Mechanic sprite, reformats code
Adds a Vox Mechanic sprite and reformats the code in
code\modules\clothing\under\jobs\engineering.dm as now every obj has a
Vox sprite
2015-09-05 18:19:29 -04:00
KasparoVy
6aafe15f18 Adds Vox sprites for remaining civviejobs, reformats code
Adds Vox sprites for the Clown, Mime, Hopwhimsy and Barber--
reformatting the code accordingly as now every obj in this list has a
Vox sprite
2015-09-05 18:14:58 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
KasparoVy
10a1e75d79 Adds Vox Security Uniforms
Adds a Vox version of every security uniform with the exception of the
jackets.

Picture coming soon!
2015-09-04 03:10:27 -04:00
KasparoVy
236dee303b Unnecessary spaces 2015-09-03 17:31:27 -04:00
KasparoVy
0e10bd2cc3 Fixes Psychedelic Jumpsuit
It wasn't using the Vox sprite because I'd forgotten to give this one a specific species_fit and sprite_sheets as it isn't a child of obj/item/clothing/under/color/
2015-09-03 17:29:41 -04:00
KasparoVy
34d7b280dc Put Jerseys back
Because travis, and apparently it IS used for something despite my not
finding any sprites for it (even for HUMANS). I guess I'll have to look
harder
2015-09-03 14:57:32 -04:00
KasparoVy
038011441f Missed a spot 2015-09-03 14:46:22 -04:00
KasparoVy
2937382b15 Moves Species_fit and Sprite_sheets to /obj/item/clothing/under/color, Removes Jerseys
Greatly reduces code as per Fox' suggestion. I outright snipped out the red and blue jerseys at the bottom because in the human icons/mob/uniform.dmi there aren't even sprites for it, and I've never ever heard of it being used. The blackf suit appears to use the same sprite as the black suit, so I figured that'd be alright too.
2015-09-03 14:45:41 -04:00
KasparoVy
255e0bd6a8 I'm dumb 2015-09-02 02:08:54 -04:00
KasparoVy
54376d4cff Vox Coloured Uniforms
Adds a Vox sprite for every single coloured uniform in color.dm and
implements it.

Had this PR waiting 'cause the stupid way I do things only allows me to
do one at a time, haha.

Anyway, you're going to have to use your imagination for this one-- as
it would be an insane amount of work to photoshoop every single sprite
onto a Vox and make a rainbow out of the lot of them.

I really wish my Dream Daemon wasn't broken.
2015-09-02 01:44:20 -04:00
KasparoVy
5d8df1e002 Fixes Vox Grey Jumpsuit
Previously the only way you'd ever see the correct Vox grey jumpsuit sprite was if you were holding it in-game or looking at the sprite in vox/uniform.dmi.

No longer! Now if a Vox player wears this jumpsuit it will look in the correct location for the sprite instead of giving them an ill-fitting human one.

Fixes part of #1130.
To fix the rest of that issue report, unfortunately-- as I'd not figured out then-- sprites for all the other colours of uniforms will need to be made and lines 51-54 copypasted to each jumpsuit code block that's added in.

I'll rewrite #1130 accordingly and see if I can work out those sprites some other time.

Before PR: <Picture Here>

AFTER PR: http://i.imgur.com/phSVZpK.png
2015-08-25 21:48:47 -04:00
Fox-McCloud
ffdca82944 Pants Fix 2015-08-24 03:20:10 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
ZomgPonies
b2e821ebb0 Fixes fancy uniform 2015-06-18 16:24:04 -04:00
TheBeoni
fd4c40fcf9 Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker. 2015-06-17 02:11:01 +02:00
ZomgPonies
9a6ac0e44a Adds in new fancy uniform for events 2015-06-15 11:05:06 -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
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Fox-McCloud
0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -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
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
ZomgPonies
31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04: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
SamCroswell
8829a90709 NT Rep + Blueshield Uniform Change 2015-03-08 16:59:01 -04:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie
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
Markolie
f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies
bdb54c4378 Adds leather chaps for both regular and fat people 2015-02-26 16:56:28 -05:00
ZomgPonies
8714512403 Superhero Part 2: Owlman vs. The Griffin! 2015-02-24 20:13:00 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Fox-McCloud
1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00