Commit Graph

358 Commits

Author SHA1 Message Date
taukausanake fd0c0904f9 how the fuck did I miss this?
How did everyone else miss it? Thanks to Keroman for telling me something was up with the bandolier.
2016-06-20 09:38:48 -05:00
monster860 3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
TheDZD e7bdf036da Merge pull request #4698 from FreeStylaLT/grammar
Fixes some grammar mistakes, changes the \red to <span class> formatting
2016-06-16 15:14:01 -04:00
FreeStylaLT 5f4830f2fb fixed spacing 2016-06-16 22:01:42 +03:00
FreeStylaLT 3b91bec479 fixed some grammar mistakes, changes the \red to <span class>
:cl:FreeStylaLT
typo: changed its to it's in lockbox description
fix: changed \red to <span> formatting
fix: changed stetchkin's price from 9 TC to 4 TC, suppressor's from 3 TC to 1 TC
2016-06-16 21:53:33 +03:00
TheDZD dbffa27bd4 Merge pull request #4667 from Fox-McCloud/toolbox-tweak
His Grace Tweak
2016-06-16 10:27:26 -04:00
KasparoVy 86c7e6c04e Secure Briefcase now On-Par with Regular Briefcase. (#4681)
In terms of carrying capacity, flags, hitsound and attack verbs.
2016-06-16 05:17:38 -04:00
Fox-McCloud ac0d05d6cf His Grace Tweak 2016-06-14 03:42:47 -04:00
monster860 64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -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 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
SamCroswell 82f037d946 SecBelts 2016-05-31 17:42:14 -04:00
Fox-McCloud 2e2aa04ad3 rare runtime fix 2016-05-09 02:53:34 -04:00
Fox-McCloud 0bba556051 checks 2016-05-08 12:20:53 -04:00
Fox-McCloud c075567df5 you saw nothing 2016-05-08 09:29:36 -04:00
Fox-McCloud 4d0c3361cc His Grace 2016-05-08 09:10:25 -04:00
Aurorablade 7e405427aa changess 2016-04-29 02:09:05 -04:00
Aurorablade 7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Mieszko Jędrzejczak 5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Fox-McCloud 2453735d3f part 2 2016-04-17 00:21:31 -04:00
TheDZD 341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
FalseIncarnate 777f8cbfb6 Beaker and Pill Bottle Labeling
Can now label Pill Bottles with pens, just like Beakers

Beakers (and pill bottles) can now accept 26 character labels from pens.
2016-04-01 15:17:47 -04:00
Tastyfish fe7fbbeb9f Allows voice activators, etc to work in storage items 2016-03-25 20:13:18 -04:00
Fox-McCloud 1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
Fox-McCloud 2dfe617998 Chem Tweaks 2016-03-10 00:28:49 -05:00
TheDZD 62afa9d6d3 Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds
Implements a Few Goon Sounds
2016-03-09 17:08:05 -05:00
Fox-McCloud 2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
VampyrBytes 1148bde3a6 eating refactor (#3733) + bugfixes
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
VampyrBytes 6afc8258a8 Adds same fix to secure storage 2016-02-24 06:54:56 +00:00
VampyrBytes c343619ebc removes unneeded brackets 2016-02-23 23:39:54 +00:00
VampyrBytes b138c3eace prevents autoequip to locked lockboxes 2016-02-23 10:05:32 +00:00
KasparoVy 679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
2016-02-18 14:59:28 -05:00
TheDZD cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade
Arcade Prize Counter
2016-02-17 16:57:49 -05:00
Fox-McCloud 9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
Fox McCloud aa7b36487b Merge pull request #3580 from VampyrBytes/PlasticBags
Fixes plastic bags suffocating when they shouldn't (#3577)
2016-02-12 13:46:06 -05:00
VampyrBytes 90c485355f Fixes plastic bags suffocating when they shouldn't (#3577)
As title. Now checks your head slot for the bag rather than relying on a
variable that might not be reset in time
2016-02-12 11:37:19 +00:00
FalseIncarnate 954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
Spacemanspark b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Spacemanspark 24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
Fox-McCloud f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
FalseIncarnate fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Fox-McCloud ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Fox-McCloud a21d1b5221 Uplink and Syndicate Cyborg Fix 2016-01-08 17:07:33 -05:00
TheDZD 6ec065b319 Merge pull request #3102 from Fox-McCloud/ert-fix
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
Fox-McCloud dfa55f1f35 ERT Medical Belt Fix 2016-01-03 21:23:49 -05:00
TheDZD cf77645cc7 Merge pull request #2853 from Regen1/Iamsodone
Nerfs the bag of holding + bag of holding effect
2016-01-03 11:34:08 -05:00
Regen 7a51db1f2f keep the !!FUN!!, remove !!ACCIDENT!! 2015-12-29 17:58:19 +01:00
Fox-McCloud 0f03947d55 Ports Elite Syndicate Hardsuit and Uplink Refactor 2015-12-28 08:37:27 -05:00