Mieszko Jędrzejczak
1a4f8cb518
Alcohol refactor v12413526345. ( #4647 )
...
* Refactors booze. Yes. I killed other commits.
* Lime juice
2016-06-19 11:52:44 -04:00
Fox-McCloud
4835482c53
Chem Patch Tweaks
2016-06-15 06:45:00 -04:00
Fox McCloud
4735879fc6
Removes Ghost Chilli Juice and Dragon's Breath ( #4495 )
2016-05-25 17:09:18 -04:00
TheDZD
6e2b236f81
Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor
...
Simple Animal Loot Refactor
2016-05-22 18:31:43 -04:00
Fox-McCloud
54b02d7ea0
Simple Animal Loot Refactor
2016-05-20 21:48:29 -04:00
Fox-McCloud
f93b696d4d
Snack Tweaks to Donk Pockets
2016-05-20 19:35:42 -04:00
TheDZD
cb5f572969
Merge pull request #4423 from Fox-McCloud/foam
...
Foam Fixes+Changes
2016-05-16 20:15:39 -04:00
Fox-McCloud
e22bc8a42b
Foam Fixes+Changes
2016-05-12 23:47:30 -04:00
KasparoVy
1d0965b1f9
Back up to date.
2016-05-10 00:25:42 -04:00
KasparoVy
13003fe351
Merge branch 'temp2' into temp
2016-05-10 00:10:15 -04:00
Fox-McCloud
52bc145c17
botany and more reagents
2016-05-06 03:43:31 -04:00
Fox-McCloud
1facb7a397
love and hugs
2016-05-05 19:50:29 -04:00
Fox-McCloud
d8375f09f2
initro, why not
2016-05-05 07:13:25 -04:00
Fox-McCloud
45fc535203
A Few More Disease and Reagents
2016-05-05 00:46:04 -04:00
Fox-McCloud
08ec1db17e
food poisoning
2016-05-04 19:58:44 -04:00
Fox-McCloud
311141225a
tweak
2016-05-04 18:08:33 -04:00
Fox-McCloud
9dca286988
tweaks and additions
2016-05-04 03:12:58 -04:00
Fox-McCloud
2bcda77cf7
oops
2016-05-03 20:31:37 -04:00
Fox-McCloud
b295e7809e
Overdose Rework
2016-05-03 19:55:11 -04:00
KasparoVy
7205d3a0e3
Hairgrownium and Super Hairgrownium now work on All Species, refactored so if it produces random hair styles for a non-human, it won't do so repeatedly until the reagent is depleted. Also means that species that need breath masks to live won't be killed by infinite fake moustaches.
2016-05-01 02:55:17 -04:00
KasparoVy
f95655419c
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1
...
Also fixes a typo or two.
TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
2016-04-30 08:12:41 -04:00
TheDZD
eba294357a
It's the bees
2016-04-14 20:30:30 -04:00
Fox-McCloud
3f7f6704c8
Xenobio Refactor/Changes
2016-04-06 01:37:04 -04: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
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
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
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
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
Mieszko Jędrzejczak
f79ef6deca
Does the same thing to synthanol
2016-03-26 22:14:31 +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
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
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
Fox McCloud
74838a86f8
Merge pull request #3854 from FlattestGuitar/synthanol_3
...
Synthanol Upgrade v2
2016-03-13 21:15:32 -04:00
Mieszko Jędrzejczak
93d3de8496
isSynthetic(), fizzes the fizzes
2016-03-13 10:25:50 +01:00
Fox-McCloud
336ec1fc55
Implements Infectious Spider Eggs
2016-03-13 04:59:37 -04:00
Mieszko Jędrzejczak
6e49832e57
WHAT IF I WANT MY FROZEN CIDER FIZZY!? (frozen cider does not fizz anymore)
2016-03-12 17:08:31 +01:00
Mieszko Jędrzejczak
f46fce2b24
Fizzes drinks
2016-03-12 15:45:13 +01:00
Mieszko Jędrzejczak
965ec810e7
Holy water glass looks like water, IPC booze makes organics puke, more synth drinks
2016-03-12 15:39:29 +01:00
Fox-McCloud
28b285754f
teslium
2016-03-11 23:15:00 -05:00
