Commit Graph

4267 Commits

Author SHA1 Message Date
TheDZD
5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots
Engineer Workboots
2016-06-22 14:03:04 -04:00
Mieszko Jędrzejczak
876ab1cdd8 Makes the medical HUD overlay smoother (#4726)
* Smoother medical hud

* Port's /tg/'s neat flashy thingies.
2016-06-21 16:56:31 -04:00
Tastyfish
3bbd041191 Fixes bad pixel in the sandstone door sprites (#4741) 2016-06-21 16:54:52 -04:00
TheDZD
7f75c132e1 Fixes inconsistent egun in_hand sprites (#4734) 2016-06-20 12:21:02 -04:00
KasparoVy
3dba1b2886 Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)
* Ports #9294 and #9322 from VG: 'Yi' to Vox-pidgin and Framework for Icon-based Skin Tone (Feat. Vox) and Glasses/Goggles for Vox.

Both ported PRs by Intigracy.

Also adds all remaining in-use glasses/goggle sprites for Vox. I cleaned up the code a bit while I was in there. Otherwise, that's it.

Furthermore, randomizing skin tone doesn't seem to work for Vox despite their being specified in the conditional lists and s_tone being not null.

* Morph Support

* CMA Support

* Ports Intigracy's vgstation13/pull/9460, Noir Vision No Longer Greys Out HUD.

* Fixes Positioning of Vox Jensen Shades East+West facing Sprites.

Fixes Heist Goofery

Game-mode (not one-click antag) Heist tweaked and returned to working order now that I've found out how to test the actual game-mode (after temporarily adjusting the population requirement).

Vox Raiders won't spawn in with whatever socks were in their selected spawn-character's preferences anymore.

Additionally, the set_species proc now zeroes out skin tone if the species doesn't have skin tone to avoid goofing up the icons on initial generation.

Also condenses the code in preferences_setup character creation icon generation. Made it use the individual species' skin-tone handling procs instead of code snowflaked into preferences_setup.dm.

* No More Vox Tail Colours, but they can Colour Their Hair.

* Removes unneeded 'src's and retroactively prohibits colouring tails on species without HAS_SKIN_COLOR.

Colouration won't be applied to src's tail unless HAS_SKIN_COLOR is in
src's species bodyflags.

* Tidies up some Lists in CharPrefs and Retroactively Prohibits Vox Hair Colouration

* Reverts unnecessary commenting out of vox armalis post-spawn handling parent call.

* Adds Emerald and Azure Vox Skin Tones.

* Stealthy Wryn Typo Fixed.

* Greyscales Vox Head+Facial Hair and Adds More Default Colours in Species Definitions

* Gives Vox Raiders Default Hair Colour and Fixes Bug where Roundstart Raiders don't get Random Skin
2016-06-19 11:35:36 -04:00
SamCroswell
3e25608535 Engineer Workboots 2016-06-18 22:08:59 -04:00
DaveTheHeadcrab
0c12ef1c0a Security Armor Update (#4660)
* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Sec Armor Update
2016-06-17 11:17:56 -04:00
TheDZD
831ab328e5 Merge pull request #4683 from Fox-McCloud/patch-tweaks
Chem Patch Tweaks
2016-06-16 10:27:14 -04:00
TheDZD
c17d0bccfd Merge pull request #4692 from Fox-McCloud/icons-sorta
Partially Fixes Graffiti
2016-06-16 10:26:02 -04:00
Fox-McCloud
57cec1fc80 Partially Fixes Graffiti 2016-06-16 05:11:22 -04:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04:00
TheDZD
d2b741b1e6 Merge pull request #4643 from Fox-McCloud/latex-glove-balloon
Adds in Ability to make Latex Gloves Balloons
2016-06-14 10:17:01 -04:00
TheDZD
cc2766e7d7 Deathwands and googly eyes (#4653) 2016-06-13 23:07:13 -04:00
Fox-McCloud
1b04261259 Adds in Ability to make Latex Gloves Balloons 2016-06-12 03:28:01 -04:00
Glorken
f347dd8014 Fixes Zeng-Hu Leg Sprite (#4634)
* Fixes Zeng-Hu Leg Sprite
You can no longer see the left leg through clothes while facing northward.

* Bishop Cybernetics feet are now the right length
Chopped off a pixel on the toes of the Bishop feet. They should now fit into shoes.
2016-06-12 02:28:25 -04:00
TheDZD
ad0b8fea29 Merge pull request #4619 from Fox-McCloud/grab-fixup
Grab Fixes and Throwing Refactor
2016-06-11 12:29:31 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
TheDZD
41386dd748 Merge pull request #4551 from Fox-McCloud/chaplain-things
Ports 3 New Chaplain Weapons
2016-06-11 11:51:11 -04:00
TheDZD
818179ebc3 Merge pull request #4562 from taukausanake/belts
More belt overlays
2016-06-11 11:50:59 -04:00
DaveTheHeadcrab
128bb4deb1 Fluff Item Adjustments (#4630)
* scanner icon

* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Fluff Item Tweaks

* Removes the stat check

* Windbreaker Starts Open
2016-06-10 00:29:51 -04:00
Fox McCloud
62af26fa16 Merge pull request #4623 from DaveTheHeadcrab/detective_stuff
Detective Scanner Update
2016-06-09 23:59:00 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox-McCloud
9f6dd7485d Merge remote-tracking branch 'upstream/master' into chaplain-things 2016-06-09 01:05:43 -04:00
SamCroswell
18260bff66 Prayer Beads - Merge Conflict Fix (For real this time) 2016-06-08 23:32:18 -04:00
SamCroswell
70812226d1 Prayer Beads - Merge Conflicts Fix 2016-06-08 23:29:38 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
TheDZD
c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00
SamCroswell
934267b2b6 Scanner - Initial Commit 2016-06-08 10:26:54 -04:00
Fox-McCloud
5238628d9d Grab Fixes and Throwing Refactor 2016-06-08 01:57:58 -04:00
SamCroswell
86a7b5cf4f scanner icon 2016-06-07 22:24:54 -04:00
Isaac Erwin
eca41351cd MrBarrelrolll Fluff Item
Adds in a fluff item for MrBarrelrolll, the Viridi Protegat. It's
functionally identical to the roman armor.
2016-06-07 00:16:00 -04:00
SamCroswell
04c7c4f843 Prayer Beads - Adds Item 2016-06-05 17:07:40 -04:00
Fox McCloud
c342d22f8b Merge pull request #4576 from Twinmold93/narsie-ai
Adds Nar-Sie Hologram and Backup Error Screen to AI
2016-06-04 21:10:29 -04:00
TheDZD
4339629cac Removes L6 SAW adminbus ammo and fixes icon update issue with energy weapons 2016-06-04 00:49:01 -04:00
taukausanake
adc5d46920 Final push, magic belt done
This should be everything finished now. Made sprites for the wand belt and animated them too! Sprites for wand of fireball, polymorph, death, resurrection, teleportation, door creation, and nothing because it's also a wand. Also made a sprite for a single soul stone for the soul stone belt. Didn't feel it needed the same treatment as the bandolier.
The only thing that might not be accepted in this commit is that I commented out the syringe and beaker for the botany belt. They clash with the belt as it is but my argument is that they aren't even used in Hydroponics anymore anyways. At the very most you'll use them for the reagents you grow but chances are you won't put them in your belt anyways.
2016-06-03 21:52:25 -05:00
taukausanake
1f1cb2f523 Janibelt done
Janitor belt icons done. Will show icons for soap, space cleaner, holograohic sign projector, light replacer, and cleaner grenade.
2016-06-03 15:26:48 -05:00
Twinmold
8e369294d8 Adds Nar-Sie Hologram and Backup Error Screen to AI
Allows the AI the ability to use the holographic Nar-Sie sprite from the
selection. Also adds in a backup error screen for the AI in the case the
icon text is incorrect when the variable is changed.
2016-06-03 04:18:27 -05:00
taukausanake
411b531d30 Medical belt add
Got the medical belt done. Has icons for a beaker, pill bottle, vial (might remove, it doesn't seem like it's used anywhere), Health Analyzer, Syringe, and emergency autoinjector just because.
2016-06-03 00:29:10 -05:00
KasparoVy
5e98a868de New Butt
The sprite's been done for quite some time but it just hasn't been put
in. An actual, functional QR code to replace the placeholder sprite in
at the moment!

-->Sprite from FullOfSkittles.<--
2016-06-02 22:39:01 -04:00
TheDZD
f17f4ccdeb Crossbows and piescannons 2016-06-02 22:17:19 -04:00
taukausanake
2668d29f05 Utility belt done
Did the icons for the utility belt. Uses wiercutters, cable coil, wrench, multitool, welding tool, pocket crowbar, and screwdriver.
2016-06-02 13:14:19 -05:00
taukausanake
8a717bf0e3 More belt overlays
I posted in PR #4548 that I'd like to try and make the other belt overlays. Here is my contribution!

Progress
- [x] Bandolier
- [x] Botany belt
- [ ] Utility belt
- [ ] Medical belt
- [ ] Janitor belt
- [ ] Holtser(?)
- [ ] Soulstone belt(?)

Bandolier works the same as the lazarus "trainer's belt". I had to remove the bottom shell pixels so that it actually held eight instead of nine shells.

Botany belt shows icons for plant analyzer, mini hoe, spade, hatchet, and wirecutters. Wirecutters will be shared with botany belt and utility belt.
2016-06-02 00:09:43 -05:00
Fox McCloud
18092add98 Merge pull request #4548 from DaveTheHeadcrab/Belts
Belt Overlay System
2016-06-01 19:28:36 -04:00
TheDZD
4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
Fox-McCloud
bc7cee537f Ports 3 New Chaplain Weapons 2016-05-31 22:15:41 -04:00
TheDZD
20ad49f9f9 Merge pull request #4383 from IK3I/Pod-Refactor
[Ready for Review] Pod refactor and fixes
2016-05-31 20:48:05 -04:00
SamCroswell
82f037d946 SecBelts 2016-05-31 17:42:14 -04:00
Ar3nn
388e7d8e9a new icons
trying this again
2016-05-29 23:01:19 -04:00
TheDZD
6f8e027296 Merge pull request #4505 from Fox-McCloud/holy-weapons
Ports TG's Holy Weapons
2016-05-29 20:48:35 -04:00