Commit Graph
965 Commits
Author SHA1 Message Date
Tastyfish 81d91df5ce Makes fingerless gloves functionally clipped 2016-04-07 17:02:17 -04:00
Tigercat2000 801cbe7f8d Alternate Appearance system (from tgstation/-tg-station#16586)
This adds an "alternate appearance system" using image overrides and a new
handler system.

Usage:
 - Create a new `image()` casted as `var/image`
 - Set image.override = 1
 - Call mob.add_alt_appearance("appearance_ID", image, listOfMobsToDisplayTo).
 - To remove an image, you use mob.remove_alt_appearance("appearance_ID")

Comes with one usage, cardborg costumes. They will now disguise you as a
standard borg to any silicon mobs and yourself.
As this is a per-client system, that means that only silicon mobs and you will
see yourself as a standard borg. All other mobs will see you as a silly
human in a cardborg costume.
2016-04-06 13:58:03 -07: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
Tigercat2000 519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Aurorablade b35299079f Fixes bloated human head 2016-03-31 17:01:23 -04:00
Fox McCloud d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Fox McCloud 0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts
Fethas Carnival of Horrors:Rusty Iron Chef
2016-03-30 16:25:27 -04:00
Tigercat2000 ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
Aurorablade db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04:00
Tastyfish d71b2bf4d2 Fixes simple animal destroy / death alarm 2016-03-23 07:55:32 -04:00
Fox-McCloud 08ef4ea49c Flag Fix 2016-03-21 21:18:41 -04:00
Fox McCloud 179187d7cb Merge pull request #3951 from KasparoVy/mask-adjust-cpr
Fixes #3948, Adjusted bandanas no longer block CPR + No more internals from adjusted breathmasks
2016-03-21 21:09:25 -04:00
Fox McCloud 0e521388d8 Merge pull request #3936 from Tastyfish/captain-ian
Improves pet collars
2016-03-21 21:05:42 -04:00
KasparoVy 620546994d Wiser Bits 2016-03-21 20:52:26 -04:00
KasparoVy 62620e1c49 Fixes 3948
When adjusted, masks that normally cover the mouth will not anymore.
When the mask is pushed back into place, it will cover the mouth again.
You won't be able to run internals from masks that aren't covering your
mouth anymore, either. This reverses when you adjust them back to
normal.
2016-03-21 15:25:16 -04:00
Fox McCloud 91e00127cd Merge pull request #3935 from FlattestGuitar/jackets
Adds three new military jackets
2016-03-21 07:21:26 -04:00
KasparoVy 1d54698b02 Fix 2016-03-20 13:13:12 -04:00
Tastyfish e98484e103 allows collars to be used as id for doors 2016-03-20 09:34:36 -04:00
Mieszko Jędrzejczak e57ca61645 Adds three new military jackets 2016-03-20 11:40:51 +01:00
FalseIncarnate 0ffb649278 Fixes Hardsuits Not Auto-deploying Boots and Helms
Apparently slots don't get set before equipped() is called, so a
spawn(1) fixed this.
2016-03-14 07:03:46 -04:00
Fox McCloud 87155ff7d3 Merge pull request #3802 from Tastyfish/chronx100
Donator Fluff Items: Chaplain Edition
2016-03-10 03:54:19 -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
Tastyfish a65fe9db00 isliving use fix 2016-03-08 23:59:41 -05:00
Fox McCloud 953c4ba1b2 Merge pull request #3786 from TheDZD/WEEEEEOOOOOWEEEEEOOOOOWEEEEEOOOOO
Brings Justice to the Station
2016-03-08 20:14:43 -05:00
TheDZD 4e47626af7 Merge pull request #3767 from Tastyfish/silence
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
Fox-McCloud 2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
TheDZD daf0c6bc31 Brings justice to the station 2016-03-07 17:50:41 -05:00
Tastyfish d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -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
TheDZD 9e05eedf52 Merge pull request #3724 from KasparoVy/redoes-redoing-suit-adjustment
Suit Adjustment Bugfixes, Fixes #3703, Fixes #3707 and Fixes #3752, Adds Blueshield Coat in_hands and Hulk Jacket Destruction
2016-03-03 20:20:37 -05:00
KasparoVy b921c9a6c4 Redoes Redoing Suit Adjustment
@Regens1 for the special hulk joke. Haha?

Hulks can destroy jackets by trying to adjust them. In the case of labcoats, when you destroy it items in the pockets (not just the suit storage slot) will be dumped on the ground below you. Stuff in the suit storage slot already got dumped on the ground, so it didn't need any special treatment.

Fixes all known issues with any adjustable jackets using the wrong sprites, including the HoS jacket

Fixes #3707 and #3703. You can now adjust breath masks while buckled into beds or chairs.

Adds Missing Red Labcoat Sprites (found copies @ the Polaris repository).

Adds Blueshield coat in_hand icons
2016-03-02 03:08:05 -05:00
Tigercat2000 0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Fox-McCloud ceff7afe94 noir mode 2016-02-26 22:10:27 -05:00
Fox-McCloud f3b29843cb Fixes 'Yeah' Glasses 2016-02-26 20:58:55 -05:00
Fox McCloud 166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings
Fethas Carnival of horrors: A new shade for the detective
2016-02-26 20:02:41 -05:00
Aurorablade 8e4681eeda you could say...
this line of code is out of sight..out of mind...
2016-02-26 05:59:34 -05:00
Aurorablade 3c7281c2dd changes 2016-02-26 00:52:57 -05:00
KasparoVy 447c3ea779 Default states and cull 2016-02-25 00:48:52 -05:00
KasparoVy aa7de9bb9a Woops. 2016-02-24 23:42:18 -05:00
Aurorablade 7b5c5c2a13 shade on shade off 2016-02-22 06:03:11 -05:00
Tastyfish 492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
Fox McCloud 29784c9875 Merge pull request #3650 from TheBeoni/Sandals
Adds new sandals.
2016-02-21 19:26:42 -05:00
Aurorablade 2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
TheBeoni bf7fcec275 Corrected. 2016-02-20 12:33:57 +01:00
Fox McCloud 2bbd877563 Merge pull request #3609 from KasparoVy/BomberJackets
Adds Opening/Closing of Bomber Jackets and Security Bomber Jacket + Refactors Jacket Adjustment + Grammar Fixes
2016-02-20 02:19:27 -05:00
TheBeoni ce0f5a962a Adds new types of sandals. 2016-02-20 02:56:26 +01:00
KasparoVy 5c5bf92d87 Adds opening/closing of bomber jackets, adds Security bomber jacket. IAA jacket is closed by default now. Replaces bomber jacket with Security bomber jacket on the Pod Pilot's table. Refactors jacket adjustment. Grammar fixes. 2016-02-19 12:05:31 -05:00
Fox McCloud 9cc5d7cb87 Merge pull request #3599 from KasparoVy/Balaclava-Fix
Mask Adjustment Bugfixes
2016-02-18 13:40:04 -05:00
KasparoVy b42e4d7da9 Mask Adjustment Bugfixes 2016-02-16 22:47:19 -05:00