Commit Graph

941 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak
62637145c5 *insert coherent commit description here* 2016-05-07 17:18:46 +02:00
Mieszko Jędrzejczak
91d3757944 Rebalanced, unsnowflaked 2016-05-07 17:02:03 +02:00
Mieszko Jędrzejczak
48888c891c Tape gags for all 2016-05-07 15:02:38 +02:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
Fox McCloud
e34fa95fae Merge pull request #4187 from QuinnAggeler/Paradise-drask
New race, the Drask
2016-04-29 19:40:45 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Fox McCloud
b743ae0ac2 Merge pull request #4315 from IK3I/No-Drop-Holster-Fix
Prevents Holstering of No-Drop items
2016-04-28 20:23:24 -04:00
IK3I
ec4ba9f5f6 Prevents Holstering of No-Drop items 2016-04-28 18:00:44 -05:00
Fox McCloud
8892def83c Merge pull request #4289 from pinatacolada/pman
Plasma security now spawn with their gun in the bag
2016-04-28 18:39:41 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
pinatacolada
e961d51472 removes judge dred 2016-04-27 01:39:29 +01:00
HugoLuman
5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask
# Conflicts:
#	icons/mob/human_face.dmi
2016-04-26 17:32:04 -07:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
TheDZD
f69ff5f30a Merge pull request #4264 from Fox-McCloud/mining-crate
Updates Mining Loot Crates
2016-04-22 23:57:32 -04:00
TheDZD
7990a25cf0 Merge pull request #4255 from Fox-McCloud/how-revolutionary
Updates Revolution
2016-04-22 23:57:03 -04:00
Tigercat2000
66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE
Conflicts:
	code/game/gamemodes/vampire/hud.dm
2016-04-21 20:31:58 -07:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
Fox-McCloud
ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -04:00
Fox-McCloud
3dd9a6d744 Updates Revolution 2016-04-21 06:36:35 -04:00
Tigercat2000
1a53464a1c Make toggle_piece more robust 2016-04-20 16:02:07 -07:00
Tigercat2000
9917906834 RIGsuit fixes
- Replaced /proc/toggle_seals with /proc/unseal and /proc/seal
- You can no longer retract anything but the helmet after you seal the
  suit (what the fuck was the point of having the seal if it does nothing
  but make it latch onto your back)
- Clicking on parts and popping them off shouldn't be a thing anymore
  (hopefully)
- Rewrote some of the nasty toggle_piece code.
2016-04-20 15:40:16 -07:00
HugoLuman
18aaaa9366 Resolves conflict in interface/stylesheet.dm
The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-20 14:44:24 -07:00
HugoLuman
03323686d4 Drask files
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 19:00:29 -07:00
pinatacolada
b9b0b3d58f Fixes #4181 2016-04-12 16:06:27 +01:00
Fox McCloud
ea9489db70 Merge pull request #4115 from tigercat2000/alt_appearances_remmie
Alternate Appearance system
2016-04-08 21:18:25 -04:00
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