Commit Graph

1445 Commits

Author SHA1 Message Date
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
FalseIncarnate
d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -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
Fox-McCloud
fe5f803476 forgot these two 2016-04-04 17:04:43 -04:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Fox McCloud
c75aededf4 Merge pull request #4072 from Crazylemon64/slime_syringe_fix
Using a syringe on slime people will now get water out of them
2016-04-02 22:47:00 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Crazylemon64
93aa9c688a Using a syringe on slime people will now get water out of them 2016-04-02 16:59:53 -07:00
Fox McCloud
817b7928eb Merge pull request #4058 from FalseIncarnate/reagents
Reagent Container Tweaks
2016-04-02 04:12:23 -04:00
Fox McCloud
d7363f5ffb Merge pull request #4064 from VampyrBytes/trashNforks
Fixes forks producing trash/not leaving trash
2016-04-01 19:53:26 -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
TheDZD
c659cca883 Merge pull request #4046 from Fox-McCloud/full-add
Fully Re-Activates Disease1
2016-04-01 15:42:02 -04: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
VampyrBytes
48ba721b91 Fixes forks producing trash/not leaving trash
Fixes #4059
Forks now don't produce trash when eaten off
Forks now do leave trash when taking the last bit of food from the
original item
2016-04-01 08:05:57 +01:00
FalseIncarnate
2338cfecfe One more color macro 2016-03-31 21:43:04 -04:00
FalseIncarnate
ce18b58e20 Prevents splashing onto closed beakers
Also removes relative pathing and replaces color macros in
glass_containers.dm
2016-03-31 21:36:38 -04:00
FalseIncarnate
0d440f088a Notify player when filling full container from sink 2016-03-31 21:12:46 -04:00
Fox-McCloud
0c74d7bc29 nanomachines traitor bottle 2016-03-31 20:38:15 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
Fox-McCloud
560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Tigercat2000
ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port
Ports Advanced Cameras
2016-03-30 18:48:16 -04:00
Fox McCloud
d83391fa68 Merge pull request #4005 from FlattestGuitar/alcohol
Alcohol percentages!
2016-03-30 16:44:41 -04:00
Tigercat2000
32c3cde6ad Fix advanced disease mixing (stupid fucking reagent code) 2016-03-30 10:55:22 -07:00
Fox-McCloud
c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000
61134f9ba4 Replace Synaptizine with Diphenhydramine, mineral for viro 2016-03-28 21:31:01 -07:00
Tigercat2000
ad7357f24b Add more virus foods, move to newchem/disease.dm 2016-03-28 17:04:31 -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
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Mieszko Jędrzejczak
f79ef6deca Does the same thing to synthanol 2016-03-26 22:14:31 +01:00
Mieszko Jędrzejczak
1a30fa8478 Removes an old bit of code. 2016-03-26 22:07:08 +01:00
Mieszko Jędrzejczak
a04ef39c9d Whoops 2016-03-26 14:45:57 +01:00
Mieszko Jędrzejczak
dbff5d765d Adds proper ethanol percentages to stuff. 2016-03-26 14:39:00 +01:00
TheDZD
ea4db4963d Makes coffee less addictive, and fake cheese non-addictive 2016-03-25 14:02:43 -04:00
Fox-McCloud
b56aeb9cd8 Chem Fire+Brute Fixes 2016-03-24 19:51:51 -04:00
Crazylemon64
33f6facdb4 Organs can now be made viable again with an application of mitocholide 2016-03-18 09:14:35 -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
af2bfb1dbf fix 2016-03-16 21:22:09 -04:00
Fox-McCloud
4ff472a0ea tweaks 2016-03-16 20:38:56 -04:00
TheDZD
0f7b5462f4 Merge pull request #3862 from Fox-McCloud/spider-eggs
Implements Infectious Spider Eggs
2016-03-15 20:59:05 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00