Commit Graph

626 Commits

Author SHA1 Message Date
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
Fox-McCloud b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04: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
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
TheDZD 85e2f1f0ab Merge pull request #3898 from Fox-McCloud/addiction-rework
Addiction Rework
2016-03-16 21:46:18 -04:00
Fox-McCloud efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox-McCloud 35607d76da Heart Tweaks 2016-03-15 13:15:09 -04:00
Fox McCloud 0f2d8b1465 Merge pull request #3886 from Tastyfish/megaphone-fix
Fixes megaphone
2016-03-15 11:19:23 -04:00
Tastyfish fd7b8f3c3f Fixes megaphone 2016-03-14 18:49:28 -04:00
Tigercat2000 b397ac11a8 RAAAAAAAAAAWR. 2016-03-14 15:01:27 -07:00
Fox-McCloud bc639a357c more sounds 2016-03-08 22:35:31 -05:00
TheDZD 4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss
Removes Halloss
2016-03-05 22:39:19 -05:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud 4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Fox-McCloud e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Tigercat2000 902bac2ca6 [510] Flashes work now, and don't permastun 2016-02-28 19:13:55 -08:00
Tigercat2000 0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Aurorablade 5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade 9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish 85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
Aurorablade 570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Tastyfish 4f197cd48b Also moved the pda stuff to a module 2016-02-12 16:51:16 -05:00
Tastyfish d3ddd683f7 Addresses various things re pda refactor 2016-02-12 16:42:27 -05:00
Tastyfish a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Aurorablade 545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox McCloud e3acd96ce7 Merge pull request #3525 from Regen1/powersink
Updates powersink to be similar to TG
2016-02-07 15:11:52 -05:00
Regen 1464bb3862 Updates powersink to be similar to TG 2016-02-06 18:20:34 +01:00
VampyrBytes de45fc9aba Cleans up slipping code
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
2016-02-03 09:44:32 +00:00
Aurorablade b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Crazylemon 9099116ae7 Ais can now hear their radio again 2016-01-25 10:12:42 -08:00
Tigercat2000 9926210354 Fixes #3323, sanitize your shit 2016-01-21 22:00:22 -08:00
Aurorablade 95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Fox McCloud ccf7297da8 Merge pull request #3297 from Tastyfish/stop-hotwiring-the-tesla-you-tossers
Trained Poly on proper tesla engine use.
2016-01-21 18:21:48 -05:00
Tastyfish d50c1ee3da Trained Poly on proper tesla engine use. Player simple mobs can now hear headsets as applicable. 2016-01-20 02:13:38 -05:00
Fox-McCloud 2ee71405ee pAI Cooldown Reduction 2016-01-19 06:24:39 -05:00
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox McCloud 96f38d0ccd Merge pull request #3120 from Tastyfish/nano-piano
Instrument UI updated to modern nanoui.
2016-01-06 03:45:43 -05:00
Tastyfish 65e2a7fdff Updates/fixes instrument ui to be a nanoui 2016-01-05 02:26:45 -05:00
Fox-McCloud a7d1bcce4e Restores a Few Object Verbs 2016-01-04 16:42:53 -05:00
Aurorablade 92e15c1b2a BREAK ALL THE THINGS 2015-12-31 01:23:44 -05:00
Aurorablade 2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade 046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Aurorablade 4b7253befc commit so i can swap branches...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Aurorablade 80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Tigercat2000 e014f4a1b6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-17 07:26:41 -08:00
Fox McCloud 3d04e396ed Merge pull request #2825 from Tastyfish/coughsplosion
Added voice analyzer & Entertainment monitor supporting audible emotes
2015-12-14 20:47:33 -05:00
Tastyfish 21d04ecfbf removed radio hear_message per fox's request 2015-12-13 20:49:16 -05:00
Tastyfish d1fa228b19 Fixed hologram hearing, megahones, intercoms&tape recorders picking up emotes in room 2015-12-13 18:29:27 -05:00
Tigercat2000 0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00