Commit Graph

151 Commits

Author SHA1 Message Date
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
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
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
Fox-McCloud
4ff472a0ea tweaks 2016-03-16 20:38:56 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox McCloud
8ea7ac01c3 Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit
Skeletons, Slime people, and other bloodless races no longer bleed
2016-03-13 21:08:47 -04:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks
Chem tweaks
2016-03-12 20:20:33 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
Crazylemon64
23a6c70b7b ahahahaha it finally works 2016-03-10 22:01:07 -08:00
Fox-McCloud
798e81f7ee last touch ups 2016-03-10 23:40:50 -05:00
Fox-McCloud
76ee7168dc part III 2016-03-10 23:03:39 -05:00
Tastyfish
1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Fox McCloud
2abd5acd41 Merge pull request #3813 from Aurorablade/Ialsoownyourspleen
yet more organ fixes
2016-03-10 03:56:30 -05:00
Fox-McCloud
2dfe617998 Chem Tweaks 2016-03-10 00:28:49 -05:00
Aurorablade
e4d9bee2b8 moar fixes 2016-03-09 18:06:08 -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
TheDZD
39335b9322 Merge pull request #3808 from Fox-McCloud/fixes
Organ Related Fixes
2016-03-09 17:01:50 -05:00
Fox-McCloud
bcb0496578 Organ Related Fixes 2016-03-09 05:41:42 -05:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -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
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
Tastyfish
5b76727d73 Changes neurotoxin drink name because of name clash with supertoxin 2016-03-03 15:26:55 -05:00
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Tastyfish
aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00
FalseIncarnate
978722c891 Returns chocolate milk recipe to normal
Reverts/fixes an accidental change that would cause issues with making
chocolate bars
2016-02-24 16:44:25 -05:00
FalseIncarnate
d2ae37c540 Cocoa Spelling and Relative Pathing Cleanup
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).

Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it

Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes

Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.

Removed a fair amount of relative pathing, but there's still more to go.
2016-02-24 16:34:23 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
TheDZD
84f01d99b9 Merge pull request #3627 from VampyrBytes/adminreagents
fixes #3615
2016-02-19 22:47:00 -05:00
VampyrBytes
4272fb8729 takes unneeded iftype check out of for loop
also adds catch in case datum paths get sent through
2016-02-19 11:03:24 +00:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
VampyrBytes
e25d9320bd admin_only not adminOnly 2016-02-18 07:53:38 +00:00
VampyrBytes
bcfb77359f reagent not regent 2016-02-17 19:07:56 +00:00
VampyrBytes
adf52304ee fixes #3615
Reagents now have an admin only marker.
adminReagentCheck takes a list of paths and removes anything containing
admin only reagents
removed possibility of random drinks containing adminordrazine
2016-02-17 12:30:07 +00:00
Tastyfish
e27fb5d27f Stops utensils from working on mouthless humanoids 2016-02-16 22:52:56 -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
fec86a78e4 as requested 2016-02-06 03:01:45 -05:00
Aurorablade
6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -05:00