Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports Tweaks #82

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0e48eb7
Merge pull request #1 from Carbonhell/master
ArcLumin Jan 23, 2017
002a0ad
Update ripley.dm
ArcLumin Jan 23, 2017
e768a49
Update reagentgrinder.dm
ArcLumin Jan 23, 2017
8033264
Update augments_chest.dm
ArcLumin Jan 23, 2017
b6149e1
Update mine_turfs.dm
ArcLumin Jan 23, 2017
2d15c17
Update mine_turfs.dm
ArcLumin Jan 23, 2017
025b3ed
Update experimentor.dm
ArcLumin Jan 23, 2017
84c2919
Update backpack.dm
ArcLumin Jan 23, 2017
88facb3
Update other_reagents.dm
ArcLumin Jan 23, 2017
b252cef
Update ammo_casings.dm
ArcLumin Jan 23, 2017
e8b3476
Update pyrotechnics.dm
ArcLumin Jan 23, 2017
3b99d21
Update toxin_reagents.dm
ArcLumin Jan 23, 2017
c1d93b9
Update uplink_item.dm
ArcLumin Jan 23, 2017
1e19748
Update headcrab.dm
ArcLumin Jan 23, 2017
5528b1e
Update uplink_kits.dm
ArcLumin Jan 23, 2017
f0dc031
Update bottle.dm
ArcLumin Jan 23, 2017
01648a7
Update drinks.dm
ArcLumin Jan 23, 2017
2477fe1
Update special.dm
ArcLumin Jan 23, 2017
0b284e2
Update toxin_reagents.dm
ArcLumin Jan 23, 2017
782a627
Update other_reagents.dm
ArcLumin Jan 23, 2017
b718143
Update recycler.dm
ArcLumin Jan 23, 2017
4300260
Update cigs_lighters.dm
ArcLumin Jan 23, 2017
9768e10
Update hydroponics.dm
ArcLumin Jan 23, 2017
a1e3972
Update ripley.dm
ArcLumin Jan 23, 2017
a55a1aa
Update teleporter.dm
ArcLumin Jan 23, 2017
a965619
Update designs.dm
ArcLumin Jan 23, 2017
cfc65f2
Update mecha_designs.dm
ArcLumin Jan 23, 2017
cbbb737
Update other_reagents.dm
ArcLumin Jan 23, 2017
c074d0f
Update machine_redemption.dm
ArcLumin Jan 25, 2017
b5a7478
Update other_reagents.dm
ArcLumin Jan 25, 2017
cf0d69d
Update augments_chest.dm
ArcLumin Jan 31, 2017
60e49c3
Update uplink_item.dm
ArcLumin Jan 31, 2017
075809a
Update uplink_item.dm
ArcLumin Jan 31, 2017
e4dbcbc
Update other_reagents.dm
ArcLumin Jan 31, 2017
b3be104
Update bottle.dm
ArcLumin Jan 31, 2017
3f08b3f
Update uplink_kits.dm
ArcLumin Jan 31, 2017
5ad8ab6
Update uplink_item.dm
ArcLumin Jan 31, 2017
badd2f4
Update mining_tools.dm
ArcLumin Feb 1, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update other_reagents.dm
  • Loading branch information
ArcLumin authored Jan 25, 2017
commit b5a7478b6be2ad845c8f5a2e0a0e51b9b2689036
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1139,13 +1139,13 @@
reagent_state = LIQUID
color = "#60AAAAAA"

/datum/reagent/colorful_reagent/on_mob_life(mob/living/M)
/datum/reagent/translucent_reagent/on_mob_life(mob/living/M)
if(M && isliving(M))
M.color = "#60AAAAAA"
..()
return

/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, reac_volume)
/datum/reagent/translucent_reagent/reaction_mob(mob/living/M, reac_volume)
if(M && isliving(M))
M.color = "#60AAAAAA"
..()
Expand Down